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/gitlab/user_access.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/gitlab/user_access.rb')
| -rw-r--r-- | lib/gitlab/user_access.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb index 8cf5d636743..27560abfb96 100644 --- a/lib/gitlab/user_access.rb +++ b/lib/gitlab/user_access.rb @@ -65,7 +65,7 @@ module Gitlab return false unless can_access_git? return false unless project - return false if !user.can?(:push_code, project) && !project.branch_allows_maintainer_push?(user, ref) + return false if !user.can?(:push_code, project) && !project.branch_allows_collaboration?(user, ref) if protected?(ProtectedBranch, project, ref) protected_branch_accessible_to?(ref, action: :push) |