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
Kazuhiko Shiozaki
gitlab-ce
Commits
36cac35b
Commit
36cac35b
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont allow remove of protected branch
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a9d60b3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+12
-8
No files found.
lib/gitlab/git_access.rb
View file @
36cac35b
...
...
@@ -44,14 +44,18 @@ module Gitlab
def
push_allowed?
(
user
,
project
,
ref
,
oldrev
,
newrev
,
forced_push
)
if
user
&&
user_allowed?
(
user
)
action
=
if
project
.
protected_branch?
(
ref
)
if
forced_push
.
to_s
==
'true'
:force_push_code_to_protected_branches
else
:push_code_to_protected_branches
end
else
:push_code
end
# we dont allow force push to protected branch
if
forced_push
.
to_s
==
'true'
:force_push_code_to_protected_branches
# and we dont allow remove of protected branch
elsif
newrev
=~
/0000000/
:remove_protected_branches
else
:push_code_to_protected_branches
end
else
:push_code
end
user
.
can?
(
action
,
project
)
else
false
...
...
This diff is collapsed.
Click to expand it.
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