diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:04:18 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:04:18 +0300 |
| commit | 6ced2f124355ac08b111b4c2ac60ae57e3851ba4 (patch) | |
| tree | 53f92c7f7766f9c0384ea507d812ce5e7d421b99 /app/services | |
| parent | cb77087246929cc92f6bd7ce2cb306855b6e6219 (diff) | |
| parent | 0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (diff) | |
Merge branch '42751-rename-mr-maintainer-push' into 'master'
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
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 |