Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
333097d7
Commit
333097d7
authored
Mar 07, 2019
by
Patrick Bajao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow protected branch creation for empty project
parent
20805bed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
lib/gitlab/checks/branch_check.rb
lib/gitlab/checks/branch_check.rb
+1
-1
spec/lib/gitlab/checks/branch_check_spec.rb
spec/lib/gitlab/checks/branch_check_spec.rb
+15
-0
No files found.
lib/gitlab/checks/branch_check.rb
View file @
333097d7
...
@@ -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
...
...
spec/lib/gitlab/checks/branch_check_spec.rb
View file @
333097d7
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment