diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2016-12-22 00:34:45 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-22 00:40:05 +0300 |
commit | 991290c91124592f1e1e9235fd04c607c7101446 (patch) | |
tree | d6431ce6b0331be7cb1247c228bd37f6987e0c7a /lib | |
parent | e9f7a26bba75a4bfa91d85cab3595e4478219500 (diff) |
Merge branch 'adam-auto-deploy' into 'master'
Auto deploy
Closes #23580
See merge request !8135
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/template/gitlab_ci_yml_template.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/template/gitlab_ci_yml_template.rb b/lib/gitlab/template/gitlab_ci_yml_template.rb index 8d1a1ed54c9..d19b0a52043 100644 --- a/lib/gitlab/template/gitlab_ci_yml_template.rb +++ b/lib/gitlab/template/gitlab_ci_yml_template.rb @@ -13,8 +13,9 @@ module Gitlab def categories { - "General" => '', - "Pages" => 'Pages' + 'General' => '', + 'Pages' => 'Pages', + 'Autodeploy' => 'autodeploy' } end @@ -25,6 +26,11 @@ module Gitlab def finder(project = nil) Gitlab::Template::Finders::GlobalTemplateFinder.new(self.base_dir, self.extension, self.categories) end + + def dropdown_names(context) + categories = context == 'autodeploy' ? ['Autodeploy'] : ['General', 'Pages'] + super().slice(*categories) + end end end end |