Merge branch 'feature/add-a-project-template-of-tencent-serverless-framework' into 'master'

Add 'tencent_serverless_framework' to built-in project template

See merge request gitlab-org/gitlab!71458

app/assets/javascripts/projects/default_project_templates.js

@@ -93,6 +93,10 @@ export default {
     text: s__('ProjectTemplates|Serverless Framework/JS'),
     icon: '.template-option .icon-serverless_framework',
   },
+  tencent_serverless_framework: {
+    text: s__('ProjectTemplates|Tencent Serverless Framework/NextjsSSR'),
+    icon: '.template-option .icon-tencent_serverless_framework',
+  },
   cluster_management: {
     text: s__('ProjectTemplates|GitLab Cluster Management'),
     icon: '.template-option .icon-cluster_management',

lib/gitlab/project_template.rb

@@ -66,6 +66,7 @@ module Gitlab
           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'),
+          ProjectTemplate.new('tencent_serverless_framework', 'Tencent Serverless Framework/NextjsSSR', _('A project boilerplate for Tencent Serverless Framework that uses Next.js SSR'), 'https://gitlab.com/project-templates/nextjsssr_demo', 'illustrations/logos/tencent_serverless_framework.svg'),
           ProjectTemplate.new('jsonnet', 'Jsonnet for Dynamic Child Pipelines', _('An example showing how to use Jsonnet with GitLab dynamic child pipelines'), 'https://gitlab.com/gitlab-org/project-templates/jsonnet'),
           ProjectTemplate.new('cluster_management', 'GitLab Cluster Management', _('An example project for managing Kubernetes clusters integrated with GitLab'), 'https://gitlab.com/gitlab-org/project-templates/cluster-management'),
           ProjectTemplate.new('kotlin_native_linux', 'Kotlin Native Linux', _('A basic template for developing Linux programs using Kotlin Native'), 'https://gitlab.com/gitlab-org/project-templates/kotlin-native-linux')

locale/gitlab.pot

@@ -1495,6 +1495,9 @@ msgstr ""
 msgid "A project boilerplate for Salesforce App development with Salesforce Developer tools"
 msgstr ""
 
+msgid "A project boilerplate for Tencent Serverless Framework that uses Next.js SSR"
+msgstr ""
+
 msgid "A project containing issues for each audit inquiry in the HIPAA Audit Protocol published by the U.S. Department of Health & Human Services"
 msgstr ""
 
@@ -27142,6 +27145,9 @@ msgstr ""
 msgid "ProjectTemplates|Static Site Editor/Middleman"
 msgstr ""
 
+msgid "ProjectTemplates|Tencent Serverless Framework/NextjsSSR"
+msgstr ""
+
 msgid "ProjectTemplates|iOS (Swift)"
 msgstr ""
 

locale/zh_CN/gitlab.po

@@ -1389,6 +1389,9 @@ msgstr "平台值可以是web, mob或app。"
 msgid "A project boilerplate for Salesforce App development with Salesforce Developer tools"
 msgstr "使用 Salesforce Developer 工具开发 Salesforce App 的项目样板"
 
+msgid "A project boilerplate for Tencent Serverless Framework that uses Next.js SSR"
+msgstr "使用腾讯云Serverless服务，迅速地构建Serverless应用"
+
 msgid "A project containing issues for each audit inquiry in the HIPAA Audit Protocol published by the U.S. Department of Health & Human Services"
 msgstr "项目包含美国卫生与公共服务部发布的HIPAA审计协议中每个审计查询的议题"
 
@@ -26818,6 +26821,9 @@ msgstr "GitLab示例项目"
 msgid "ProjectTemplates|Serverless Framework/JS"
 msgstr "Serverless Framework/JS"
 
+msgid "ProjectTemplates|Tencent Serverless Framework/NextjsSSR"
+msgstr "Tencent Serverless Framework/NextjsSSR"
+
 msgid "ProjectTemplates|Spring"
 msgstr "Spring"
 

locale/zh_HK/gitlab.po

@@ -1389,6 +1389,9 @@ msgstr ""
 msgid "A project boilerplate for Salesforce App development with Salesforce Developer tools"
 msgstr ""
 
+msgid "A project boilerplate for Tencent Serverless Framework that uses Next.js SSR"
+msgstr "使用騰訊雲Serverless服務，迅速地構建Serverless應用"
+
 msgid "A project containing issues for each audit inquiry in the HIPAA Audit Protocol published by the U.S. Department of Health & Human Services"
 msgstr ""
 
@@ -26818,6 +26821,9 @@ msgstr ""
 msgid "ProjectTemplates|Serverless Framework/JS"
 msgstr ""
 
+msgid "ProjectTemplates|Tencent Serverless Framework/NextjsSSR"
+msgstr "Tencent Serverless Framework/NextjsSSR"
+
 msgid "ProjectTemplates|Spring"
 msgstr ""
 

locale/zh_TW/gitlab.po

@@ -1389,6 +1389,9 @@ msgstr ""
 msgid "A project boilerplate for Salesforce App development with Salesforce Developer tools"
 msgstr ""
 
+msgid "A project boilerplate for Tencent Serverless Framework that uses Next.js SSR"
+msgstr "使用騰訊雲Serverless服務，迅速地構建Serverless應用"
+
 msgid "A project containing issues for each audit inquiry in the HIPAA Audit Protocol published by the U.S. Department of Health & Human Services"
 msgstr ""
 
@@ -26818,6 +26821,9 @@ msgstr ""
 msgid "ProjectTemplates|Serverless Framework/JS"
 msgstr ""
 
+msgid "ProjectTemplates|Tencent Serverless Framework/NextjsSSR"
+msgstr "Tencent Serverless Framework/NextjsSSR"
+
 msgid "ProjectTemplates|Spring"
 msgstr ""
 

spec/lib/gitlab/project_template_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe Gitlab::ProjectTemplate do
         gomicro gatsby hugo jekyll plainhtml gitbook
         hexo sse_middleman gitpod_spring_petclinic nfhugo
         nfjekyll nfplainhtml nfgitbook nfhexo salesforcedx
-        serverless_framework jsonnet cluster_management
-        kotlin_native_linux
+        serverless_framework tencent_serverless_framework
+        jsonnet cluster_management kotlin_native_linux
       ]
 
       expect(described_class.all).to be_an(Array)