diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 06:06:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 06:06:20 +0000 |
commit | 44baf08d4ff4b0d32fecfded843257e2fc49a63c (patch) | |
tree | ac056e38e6b3daf04cd69f539a767eefb9a00144 | |
parent | c1f270b8ba4602952c36ce042e5eae439b22f9a6 (diff) | |
download | gitlab-ce-44baf08d4ff4b0d32fecfded843257e2fc49a63c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | app/assets/javascripts/projects/project_new.js | 4 | ||||
-rw-r--r-- | app/models/concerns/deployment_platform.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/32358-add-modsec-feature-flag-to-usage-ping.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/33805-add_serverless_framework_template.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/make_cluster_management_project_ff_default_enabled.yml | 5 | ||||
-rw-r--r-- | doc/user/clusters/management_project.md | 15 | ||||
-rw-r--r-- | lib/gitlab/project_template.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/usage_data.rb | 3 | ||||
-rw-r--r-- | locale/gitlab.pot | 6 | ||||
-rw-r--r-- | spec/lib/gitlab/project_template_spec.rb | 3 | ||||
-rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 1 | ||||
-rw-r--r-- | vendor/project_templates/serverless_framework.tar.gz | bin | 0 -> 92193 bytes |
12 files changed, 34 insertions, 18 deletions
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 9066844f687..2429da9c061 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -182,6 +182,10 @@ const bindEvents = () => { text: s__('ProjectTemplates|Netlify/Hexo'), icon: '.template-option .icon-netlify', }, + serverless_framework: { + text: s__('ProjectTemplates|Serverless Framework/JS'), + icon: '.template-option .icon-serverless_framework', + }, }; const selectedTemplate = templates[value]; diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb index d0b10fd8671..3b893a56bd6 100644 --- a/app/models/concerns/deployment_platform.rb +++ b/app/models/concerns/deployment_platform.rb @@ -12,7 +12,7 @@ module DeploymentPlatform private def cluster_management_project_enabled? - Feature.enabled?(:cluster_management_project, self) + Feature.enabled?(:cluster_management_project, self, default_enabled: true) end def find_deployment_platform(environment) diff --git a/changelogs/unreleased/32358-add-modsec-feature-flag-to-usage-ping.yml b/changelogs/unreleased/32358-add-modsec-feature-flag-to-usage-ping.yml new file mode 100644 index 00000000000..9bfdf4eb513 --- /dev/null +++ b/changelogs/unreleased/32358-add-modsec-feature-flag-to-usage-ping.yml @@ -0,0 +1,5 @@ +--- +title: Add modsecurity feature flag to usage ping +merge_request: 20194 +author: +type: added diff --git a/changelogs/unreleased/33805-add_serverless_framework_template.yml b/changelogs/unreleased/33805-add_serverless_framework_template.yml new file mode 100644 index 00000000000..3f6ceddc84e --- /dev/null +++ b/changelogs/unreleased/33805-add_serverless_framework_template.yml @@ -0,0 +1,5 @@ +--- +title: Add template for Serverless Framework/JS +merge_request: 33805 +author: +type: added diff --git a/changelogs/unreleased/make_cluster_management_project_ff_default_enabled.yml b/changelogs/unreleased/make_cluster_management_project_ff_default_enabled.yml new file mode 100644 index 00000000000..faabcca665e --- /dev/null +++ b/changelogs/unreleased/make_cluster_management_project_ff_default_enabled.yml @@ -0,0 +1,5 @@ +--- +title: Specify management project for a Kubernetes cluster +merge_request: 20216 +author: +type: added diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md index a052239448f..83b6f6fe300 100644 --- a/doc/user/clusters/management_project.md +++ b/doc/user/clusters/management_project.md @@ -83,7 +83,7 @@ to a management project: | Staging | `staging` | | Production | `production` | -The the following environments set in +The following environments set in [`.gitlab-ci.yml`](../../ci/yaml/README.md) will deploy to the Development, Staging, and Production cluster respectively. @@ -109,16 +109,3 @@ configure production cluster: environment: name: production ``` - -## Enabling this feature - -This feature is disabled by default. To enable this feature, enable the -feature flag `:cluster_management_project`. - -To check if the feature flag is enabled on your GitLab instance, -please ask an administrator to execute the following in a Rails console: - -```ruby -Feature.enabled?(:cluster_management_project) # Check if it's enabled or not. -Feature.disable(:cluster_management_project) # Disable the feature flag. -``` diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index fa1d1203842..279fc4aa375 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -53,7 +53,8 @@ module Gitlab ProjectTemplate.new('nfjekyll', 'Netlify/Jekyll', _('A Jekyll site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfjekyll', 'illustrations/logos/netlify.svg'), 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('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('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 class << self diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 02afd42d9d3..b6effac25c6 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -135,7 +135,8 @@ module Gitlab prometheus_metrics_enabled: Gitlab::Metrics.prometheus_metrics_enabled?, reply_by_email_enabled: Gitlab::IncomingEmail.enabled?, signup_enabled: Gitlab::CurrentSettings.allow_signup?, - web_ide_clientside_preview_enabled: Gitlab::CurrentSettings.web_ide_clientside_preview_enabled? + web_ide_clientside_preview_enabled: Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?, + ingress_modsecurity_enabled: Feature.enabled?(:ingress_modsecurity) } end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 17eab68b961..9be13d4e214 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -660,6 +660,9 @@ msgstr "" msgid "A Let's Encrypt account will be configured for this GitLab installation using your email address. You will receive emails to warn of expiring certificates." msgstr "" +msgid "A basic page and serverless function that uses AWS Lambda, AWS API Gateway, and GitLab Pages" +msgstr "" + msgid "A default branch cannot be chosen for an empty project." msgstr "" @@ -13504,6 +13507,9 @@ msgstr "" msgid "ProjectTemplates|Ruby on Rails" msgstr "" +msgid "ProjectTemplates|Serverless Framework/JS" +msgstr "" + msgid "ProjectTemplates|Spring" msgstr "" diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 83acd979a80..5559b1e4291 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -22,7 +22,8 @@ describe Gitlab::ProjectTemplate do described_class.new('nfjekyll', 'Netlify/Jekyll', _('A Jekyll site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features.'), 'https://gitlab.com/pages/nfjekyll'), 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('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('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') ] expect(described_class.all).to be_an(Array) diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 343e70b6dea..484684eeb65 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -85,6 +85,7 @@ describe Gitlab::UsageData do influxdb_metrics_enabled prometheus_metrics_enabled web_ide_clientside_preview_enabled + ingress_modsecurity_enabled )) end diff --git a/vendor/project_templates/serverless_framework.tar.gz b/vendor/project_templates/serverless_framework.tar.gz Binary files differnew file mode 100644 index 00000000000..b09de0ec3a2 --- /dev/null +++ b/vendor/project_templates/serverless_framework.tar.gz |