diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-23 04:54:57 +0300 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-01 08:33:12 +0300 |
| commit | 0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (patch) | |
| tree | 1a494b42fdc26c700c87f5ce65e5553ed7ab78db /lib/api/merge_requests.rb | |
| parent | 76c23de3b63503a08a715afb6414596a7a4879d2 (diff) | |
Rephrase "maintainer" to more precise "members who can merge to the target branch"
"Maintainer" will be freed to be used for #42751
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index b1e510d72de..55e83303536 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -162,7 +162,8 @@ module API optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign the merge request' optional :labels, type: String, desc: 'Comma-separated list of label names' optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging' - optional :allow_maintainer_to_push, type: Boolean, desc: 'Whether a maintainer of the target project can push to the source project' + optional :allow_collaboration, type: Boolean, desc: 'Allow commits from members who can merge to the target branch' + optional :allow_maintainer_to_push, type: Boolean, as: :allow_collaboration, desc: '[deprecated] See allow_collaboration' optional :squash, type: Grape::API::Boolean, desc: 'When true, the commits will be squashed into a single commit on merge' use :optional_params_ee |