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 /spec/lib | |
| parent | c1f270b8ba4602952c36ce042e5eae439b22f9a6 (diff) | |
| download | gitlab-ce-44baf08d4ff4b0d32fecfded843257e2fc49a63c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/project_template_spec.rb | 3 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 1 |
2 files changed, 3 insertions, 1 deletions
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 |