diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-08-31 12:38:32 +0200 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-14 14:50:32 +0200 |
| commit | 073ba05d315881730de3995042cc4256c116e2c4 (patch) | |
| tree | 7c8d4f56a8fe9a991b0a03f221ff7fad5332ccd5 /lib/api/merge_requests.rb | |
| parent | b9287208523e1a5c05939fe0db038df51a9082fc (diff) | |
| download | gitlab-ce-073ba05d315881730de3995042cc4256c116e2c4.tar.gz | |
Support discussion lock in the API
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 56d72d511da..35395647fac 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -213,12 +213,14 @@ module API :remove_source_branch, :state_event, :target_branch, - :title + :title, + :discussion_locked ] optional :title, type: String, allow_blank: false, desc: 'The title of the merge request' optional :target_branch, type: String, allow_blank: false, desc: 'The target branch' optional :state_event, type: String, values: %w[close reopen], desc: 'Status of the merge request' + optional :discussion_locked, type: Boolean, desc: 'Whether the MR discussion is locked' use :optional_params at_least_one_of(*at_least_one_of_ce) |