summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-27 10:52:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-27 10:52:04 +0000
commitfe60079454cd2d59ea53d81660836fd3c697c4fb (patch)
tree250989b0af28e4553de0ac4d3ce1113a5df4b7de /lib
parent5db934372b713e9939c3809af9b0100cd318d0fc (diff)
parentdb8ee6672cf49a2eed4e244080246f21a9e14dd9 (diff)
downloadgitlab-ce-fe60079454cd2d59ea53d81660836fd3c697c4fb.tar.gz
Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/template/gitlab_ci_yml_template.rb4
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