Merge branch 'salesforcedx_project_template' into 'master'

Add SalesforceDX project template

See merge request gitlab-org/gitlab!20831

app/assets/javascripts/projects/project_new.js

@@ -182,6 +182,10 @@ const bindEvents = () => {
         text: s__('ProjectTemplates|Netlify/Hexo'),
         icon: '.template-option .icon-netlify',
       },
+      salesforcedx: {
+        text: s__('ProjectTemplates|SalesforceDX'),
+        icon: '.template-option svg.icon-gitlab',
+      },
       serverless_framework: {
         text: s__('ProjectTemplates|Serverless Framework/JS'),
         icon: '.template-option .icon-serverless_framework',

changelogs/unreleased/salesforcedx_project_template.yml

+---
+title: Add SalesforceDX project template
+merge_request: 20831
+author:
+type: added

lib/gitlab/project_template.rb

@@ -54,6 +54,7 @@ module Gitlab
       ProjectTemplate.new('nfplainhtml', 'Netlify/Plain HTML', _('A plain HTML site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfplain-html', 'illustrations/logos/netlify.svg'),
       ProjectTemplate.new('nfgitbook', 'Netlify/GitBook', _('A GitBook site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfgitbook', 'illustrations/logos/netlify.svg'),
       ProjectTemplate.new('nfhexo', 'Netlify/Hexo', _('A Hexo site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfhexo', 'illustrations/logos/netlify.svg'),
+      ProjectTemplate.new('salesforcedx', 'SalesforceDX', _('A project boilerplate for Salesforce App development with Salesforce Developer tools.'), 'https://gitlab.com/gitlab-org/project-templates/salesforcedx'),
       ProjectTemplate.new('serverless_framework', 'Serverless Framework/JS', _('A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages'), 'https://gitlab.com/gitlab-org/project-templates/serverless-framework', 'illustrations/logos/serverless_framework.svg')
     ].freeze
 

locale/gitlab.pot

@@ -696,6 +696,9 @@ msgstr ""
 msgid "A plain HTML site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features."
 msgstr ""
 
+msgid "A project boilerplate for Salesforce App development with Salesforce Developer tools."
+msgstr ""
+
 msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}."
 msgstr ""
 
@@ -13721,6 +13724,9 @@ msgstr ""
 msgid "ProjectTemplates|Ruby on Rails"
 msgstr ""
 
+msgid "ProjectTemplates|SalesforceDX"
+msgstr ""
+
 msgid "ProjectTemplates|Serverless Framework/JS"
 msgstr ""
 

spec/lib/gitlab/project_template_spec.rb

@@ -23,6 +23,7 @@ describe Gitlab::ProjectTemplate do
         described_class.new('nfplainhtml', 'Netlify/Plain HTML', _('A plain HTML site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfplain-html'),
         described_class.new('nfgitbook', 'Netlify/GitBook', _('A GitBook site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfgitbook'),
         described_class.new('nfhexo', 'Netlify/Hexo', _('A Hexo site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfhexo'),
+        described_class.new('salesforcedx', 'SalesforceDX', _('A project boilerplate for Salesforce App development with Salesforce Developer tools.'), 'https://gitlab.com/gitlab-org/project-templates/salesforcedx'),
         described_class.new('serverless_framework', 'Serverless Framework/JS', _('A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages'), 'https://gitlab.com/gitlab-org/project-templates/serverless-framework', 'illustrations/logos/serverless_framework.svg')
       ]