diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-23 09:54:57 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-01 14:33:12 +0900 |
| commit | 0d44f4d50ef175997fe1f90de9e622a4f3b867e3 (patch) | |
| tree | 1a494b42fdc26c700c87f5ce65e5553ed7ab78db /app/helpers/merge_requests_helper.rb | |
| parent | 76c23de3b63503a08a715afb6414596a7a4879d2 (diff) | |
| download | gitlab-ce-0d44f4d50ef175997fe1f90de9e622a4f3b867e3.tar.gz | |
Rephrase "maintainer" to more precise "members who can merge to the target branch"42751-rename-mr-maintainer-push
"Maintainer" will be freed to be used for #42751
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 74251c260f0..5ff06b3e0fc 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -126,8 +126,8 @@ module MergeRequestsHelper link_to(url[merge_request.project, merge_request], data: data_attrs, &block) end - def allow_maintainer_push_unavailable_reason(merge_request) - return if merge_request.can_allow_maintainer_to_push?(current_user) + def allow_collaboration_unavailable_reason(merge_request) + return if merge_request.can_allow_collaboration?(current_user) minimum_visibility = [merge_request.target_project.visibility_level, merge_request.source_project.visibility_level].min |