diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-28 17:05:00 +0300 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-28 17:05:00 +0300 |
| commit | 19edeba8e3e8d091853ceed27f271cd67a636551 (patch) | |
| tree | 69aec50650e2a771b5d601e3ac12436620dee65c /lib/gitlab/user_access.rb | |
| parent | 61046e75d8e6f660e55f4f7b5a76238611a0f48f (diff) | |
Prevent people from creating branches if they don't have persmission to push
Diffstat (limited to 'lib/gitlab/user_access.rb')
| -rw-r--r-- | lib/gitlab/user_access.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/user_access.rb b/lib/gitlab/user_access.rb index 54728e5ff0e..e46ff313654 100644 --- a/lib/gitlab/user_access.rb +++ b/lib/gitlab/user_access.rb @@ -44,9 +44,7 @@ module Gitlab if ProtectedBranch.protected?(project, ref) return true if project.empty_repo? && project.user_can_push_to_empty_repo?(user) - has_access = project.protected_branches.protected_ref_accessible_to?(ref, user, action: :push) - - has_access || !project.repository.branch_exists?(ref) && can_merge_to_branch?(ref) + project.protected_branches.protected_ref_accessible_to?(ref, user, action: :push) else user.can?(:push_code, project) end |