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 /app/services | |
| 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 'app/services')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 231ab76fde4..4c420b38258 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -38,8 +38,8 @@ module MergeRequests def filter_params(merge_request) super - unless merge_request.can_allow_maintainer_to_push?(current_user) - params.delete(:allow_maintainer_to_push) + unless merge_request.can_allow_collaboration?(current_user) + params.delete(:allow_collaboration) end end |