diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-23 09:41:23 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-23 09:41:23 +0000 |
| commit | f4101aeac73368adcab223f14bf3d4d92d718b8b (patch) | |
| tree | ac74ffc67d9c8605cc5660157344c1cec345309b /lib/gitlab | |
| parent | 9cffa428ad1b572437c38d7a3a41a26c35cc3576 (diff) | |
| parent | 0d98f1bba2caf7ee5056510781c61db030551a66 (diff) | |
| download | gitlab-ce-f4101aeac73368adcab223f14bf3d4d92d718b8b.tar.gz | |
Merge branch 'rm-src-branch' into 'master'
Support remove source branch on merge w/ push options
See merge request gitlab-org/gitlab-ce!30728
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/push_options.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/push_options.rb b/lib/gitlab/push_options.rb index 3137676ba4b..b96590af08e 100644 --- a/lib/gitlab/push_options.rb +++ b/lib/gitlab/push_options.rb @@ -4,7 +4,12 @@ module Gitlab class PushOptions VALID_OPTIONS = HashWithIndifferentAccess.new({ merge_request: { - keys: [:create, :merge_when_pipeline_succeeds, :target] + keys: [ + :create, + :merge_when_pipeline_succeeds, + :remove_source_branch, + :target + ] }, ci: { keys: [:skip] |