summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorLuke Duncalfe <lduncalfe@gitlab.com>2019-04-05 13:22:58 +0000
committerLuke Duncalfe <lduncalfe@eml.cc>2019-04-09 10:03:26 +1200
commit68f189ad23d7a384f40caa152d263fdf1465b30a (patch)
tree36f9b0f177b6238c0a730f23134d80c02e79f982 /lib/gitlab
parent1883e320eafa02b332a16eec658f65c4a28def83 (diff)
downloadgitlab-ce-68f189ad23d7a384f40caa152d263fdf1465b30a.tar.gz
Support merge on pipeline success w/ push options
MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `merge_when_pipeline_succeeds` set using git push options. To create a new merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.create \ -o merge_request.merge_when_pipeline_succeeds To update an existing merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.merge_when_pipeline_succeeds Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/push_options.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/push_options.rb b/lib/gitlab/push_options.rb
index 7c655c12995..810aba436cc 100644
--- a/lib/gitlab/push_options.rb
+++ b/lib/gitlab/push_options.rb
@@ -4,7 +4,7 @@ module Gitlab
class PushOptions
VALID_OPTIONS = HashWithIndifferentAccess.new({
merge_request: {
- keys: [:create, :target]
+ keys: [:create, :merge_when_pipeline_succeeds, :target]
},
ci: {
keys: [:skip]