diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-27 13:52:04 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2016-12-27 19:50:01 +0300 |
commit | 18caf1ccb17d95e3471c335b8d2e965ac4251de7 (patch) | |
tree | d0bdc4bf3f53c9a2908cb7b2572597de926fcc45 /lib/gitlab | |
parent | f6f5cbbb7655f5950609ff6af7628a652a5b199c (diff) |
Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy"
Closes #25999
See merge request !8289
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/template/gitlab_ci_yml_template.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb index d19b0a52043..9d2ecee9756 100644 --- a/lib/gitlab/template/gitlab_ci_yml_template.rb +++ b/lib/gitlab/template/gitlab_ci_yml_template.rb @@ -15,7 +15,7 @@ module Gitlab { 'General' => '', 'Pages' => 'Pages', - 'Autodeploy' => 'autodeploy' + 'Auto deploy' => 'autodeploy' } end @@ -28,7 +28,7 @@ module Gitlab end def dropdown_names(context) - categories = context == 'autodeploy' ? ['Autodeploy'] : ['General', 'Pages'] + categories = context == 'autodeploy' ? ['Auto deploy'] : ['General', 'Pages'] super().slice(*categories) end end |