From 18caf1ccb17d95e3471c335b8d2e965ac4251de7 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 27 Dec 2016 10:52:04 +0000 Subject: Merge branch 'auto-deploy-with-space' into 'master' Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289 --- lib/gitlab/template/gitlab_ci_yml_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/gitlab') 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 -- cgit v1.2.3