summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-12-21 16:21:55 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-12-21 16:21:55 +0100
commit9809a9af8a3980f8a65262295cfd9701e793ac11 (patch)
tree7f7f392a203798b2cbebba6c08f8875c433ca4f0 /app/helpers
parent528c3e2b8d2d65257e489601220f34b918b80e17 (diff)
downloadgitlab-ce-9809a9af8a3980f8a65262295cfd9701e793ac11.tar.gz
Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy
The button allows to choose a ".gitlab-ci.yml" template that automatically sets up the deployment of an application. The currently supported template is Kubernetes template.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/blob_helper.rb2
-rw-r--r--app/helpers/projects_helper.rb6
2 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index f31d4fb897d..c3508443d8a 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -188,7 +188,7 @@ module BlobHelper
end
def gitlab_ci_ymls
- @gitlab_ci_ymls ||= Gitlab::Template::GitlabCiYmlTemplate.dropdown_names
+ @gitlab_ci_ymls ||= Gitlab::Template::GitlabCiYmlTemplate.dropdown_names(params[:context])
end
def dockerfile_names
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index d2177f683a1..7445f3c113c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -280,13 +280,15 @@ module ProjectsHelper
end
end
- def add_special_file_path(project, file_name:, commit_message: nil)
+ def add_special_file_path(project, file_name:, commit_message: nil, target_branch: nil, context: nil)
namespace_project_new_blob_path(
project.namespace,
project,
project.default_branch || 'master',
file_name: file_name,
- commit_message: commit_message || "Add #{file_name.downcase}"
+ commit_message: commit_message || "Add #{file_name.downcase}",
+ target_branch: target_branch,
+ context: context
)
end