Commit 333097d7 authored by Patrick Bajao's avatar Patrick Bajao

Allow protected branch creation for empty project

parent 20805bed
...@@ -46,7 +46,7 @@ module Gitlab ...@@ -46,7 +46,7 @@ module Gitlab
end end
end end
if creation? && protected_branch_creation_enabled? if creation? && protected_branch_creation_enabled? && !project.empty_repo?
protected_branch_creation_checks protected_branch_creation_checks
elsif deletion? elsif deletion?
protected_branch_deletion_checks protected_branch_deletion_checks
......
...@@ -116,6 +116,21 @@ describe Gitlab::Checks::BranchCheck do ...@@ -116,6 +116,21 @@ describe Gitlab::Checks::BranchCheck do
.and_return(['branch']) .and_return(['branch'])
end end
context "when repo is empty" do
let(:project) { create(:project, :empty_repo) }
let(:ref) { 'refs/heads/master' }
before do
allow(user_access)
.to receive(:can_push_to_branch?)
.and_return(true)
end
it 'allows branch creation' do
expect { subject.validate! }.not_to raise_error
end
end
context "newrev isn't in any protected branches" do context "newrev isn't in any protected branches" do
before do before do
allow(ProtectedBranch) allow(ProtectedBranch)
......
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