diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-27 14:18:32 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-07 15:12:31 +0100 |
| commit | c9557ad711c6cdf4465fb8c3c9b0dbaffcafa0e8 (patch) | |
| tree | 0b54dcec837e4101588813df8c10e1232e13bc32 /lib | |
| parent | b2ef83856de8c175d384688d09023d16dcfef0c6 (diff) | |
| download | gitlab-ce-c9557ad711c6cdf4465fb8c3c9b0dbaffcafa0e8.tar.gz | |
Allow maintainers to push to a single branch
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/user_access.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb index 91b8bb2a83f..fa32776d9f8 100644 --- a/lib/gitlab/user_access.rb +++ b/lib/gitlab/user_access.rb @@ -68,8 +68,12 @@ module Gitlab return true if project.user_can_push_to_empty_repo?(user) protected_branch_accessible_to?(ref, action: :push) + elsif user.can?(:push_code, project) + true + elsif user.can?(:push_single_branch, project) + project.branches_allowing_maintainer_access_to_user(user).include?(ref) else - user.can?(:push_code, project) + false end end |