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/models/merge_request.rb | |
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/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4c1628d2bdb..535a2c362f2 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1125,21 +1125,21 @@ class MergeRequest < ActiveRecord::Base project.merge_requests.merged.where(author_id: author_id).empty? end - def allow_maintainer_to_push - maintainer_push_possible? && super + def allow_collaboration + collaborative_push_possible? && super end - alias_method :allow_maintainer_to_push?, :allow_maintainer_to_push + alias_method :allow_collaboration?, :allow_collaboration - def maintainer_push_possible? + def collaborative_push_possible? source_project.present? && for_fork? && target_project.visibility_level > Gitlab::VisibilityLevel::PRIVATE && source_project.visibility_level > Gitlab::VisibilityLevel::PRIVATE && !ProtectedBranch.protected?(source_project, source_branch) end - def can_allow_maintainer_to_push?(user) - maintainer_push_possible? && + def can_allow_collaboration?(user) + collaborative_push_possible? && Ability.allowed?(user, :push_code, source_project) end |