Commit 623eb34f authored by Douwe Maan's avatar Douwe Maan

Merge branch '28968-revert-allow-people-with-merge-access-to-create-branches' into 'master'

Prevent people from creating branches if they don't have persmission to push

Closes #28968

See merge request !10983
parents 0789d7aa 19edeba8
---
title: Prevent people from creating branches if they don't have persmission to push
merge_request:
author:
......@@ -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
......
......@@ -87,10 +87,10 @@ describe Gitlab::UserAccess, lib: true do
expect(access.can_push_to_branch?(branch.name)).to be_falsey
end
it 'returns true if branch does not exist and user has permission to merge' do
it 'returns false if branch does not exist' do
project.team << [user, :developer]
expect(access.can_push_to_branch?(not_existing_branch.name)).to be_truthy
expect(access.can_push_to_branch?(not_existing_branch.name)).to be_falsey
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment