diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-25 16:37:05 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-25 16:37:05 +0000 |
commit | 767c5f63886536eefc4daf081ecba5b45fe8cc3c (patch) | |
tree | f6874ad0f833920ca1eef6639e3f0e892fa76c21 /lib/gitlab | |
parent | aa9db9c869ecbc570bd03f02dd3febf32f99d560 (diff) | |
parent | 7cf4bf848f9d3018af2c87d7c88b26b7610db995 (diff) | |
download | gitlab-ce-767c5f63886536eefc4daf081ecba5b45fe8cc3c.tar.gz |
Merge branch 'label-descr-push-opts' into 'master'
Support title and desc on merge w/ push option
See merge request gitlab-org/gitlab-ce!31068
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/push_options.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/push_options.rb b/lib/gitlab/push_options.rb index b96590af08e..682edfc4259 100644 --- a/lib/gitlab/push_options.rb +++ b/lib/gitlab/push_options.rb @@ -6,9 +6,11 @@ module Gitlab merge_request: { keys: [ :create, + :description, :merge_when_pipeline_succeeds, :remove_source_branch, - :target + :target, + :title ] }, ci: { |