diff options
| author | Fabio Busatto <fabio@gitlab.com> | 2018-05-04 12:48:53 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-04 12:48:53 +0300 |
| commit | 1d74a0e93a8d60b44bc02e4eef8175f5c2170232 (patch) | |
| tree | b6bf4ab694c76e7cd2bd4b6c186bc4167da13fad | |
| parent | 04d07cc5b4177132d3dcf0afb1729314a4b284cb (diff) | |
Resolve "Reconcile project templates with Auto DevOps"
| -rw-r--r-- | changelogs/unreleased/36762-reconcile-project-templates-with-auto-devops.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/project_template.rb | 6 | ||||
| -rw-r--r-- | vendor/project_templates/express.tar.gz | bin | 5608 -> 4866 bytes | |||
| -rw-r--r-- | vendor/project_templates/rails.tar.gz | bin | 25004 -> 25151 bytes | |||
| -rw-r--r-- | vendor/project_templates/spring.tar.gz | bin | 50938 -> 49430 bytes |
5 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/36762-reconcile-project-templates-with-auto-devops.yml b/changelogs/unreleased/36762-reconcile-project-templates-with-auto-devops.yml new file mode 100644 index 00000000000..8169b18f875 --- /dev/null +++ b/changelogs/unreleased/36762-reconcile-project-templates-with-auto-devops.yml @@ -0,0 +1,5 @@ +--- +title: Reconcile project templates with Auto DevOps +merge_request: 18737 +author: +type: changed diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index ae136202f0c..08f6a54776f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -25,9 +25,9 @@ module Gitlab end TEMPLATES_TABLE = [ - ProjectTemplate.new('rails', 'Ruby on Rails', 'Includes an MVC structure, gemfile, rakefile, and .gitlab-ci.yml file, along with many others, to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/rails'), - ProjectTemplate.new('spring', 'Spring', 'Includes an MVC structure, mvnw, pom.xml, and .gitlab-ci.yml file to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/spring'), - ProjectTemplate.new('express', 'NodeJS Express', 'Includes an MVC structure and .gitlab-ci.yml file to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/express') + ProjectTemplate.new('rails', 'Ruby on Rails', 'Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/rails'), + ProjectTemplate.new('spring', 'Spring', 'Includes an MVC structure, mvnw and pom.xml to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/spring'), + ProjectTemplate.new('express', 'NodeJS Express', 'Includes an MVC structure to help you get started.', 'https://gitlab.com/gitlab-org/project-templates/express') ].freeze class << self diff --git a/vendor/project_templates/express.tar.gz b/vendor/project_templates/express.tar.gz Binary files differindex 06093deb459..8dd5fa36987 100644 --- a/vendor/project_templates/express.tar.gz +++ b/vendor/project_templates/express.tar.gz diff --git a/vendor/project_templates/rails.tar.gz b/vendor/project_templates/rails.tar.gz Binary files differindex 85cc1b6bb78..89337dc5c31 100644 --- a/vendor/project_templates/rails.tar.gz +++ b/vendor/project_templates/rails.tar.gz diff --git a/vendor/project_templates/spring.tar.gz b/vendor/project_templates/spring.tar.gz Binary files differindex e98d3ce7b8f..31c90d0820f 100644 --- a/vendor/project_templates/spring.tar.gz +++ b/vendor/project_templates/spring.tar.gz |