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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f12d6278
Commit
f12d6278
authored
Sep 23, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ref parsing in Gitlab::GitAccess
parent
e586ee34
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
5 deletions
+26
-5
CHANGELOG
CHANGELOG
+3
-0
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+23
-5
No files found.
CHANGELOG
View file @
f12d6278
v 7.3.1
- Fix ref parsing in Gitlab::GitAccess
v 7.3.0
v 7.3.0
- Always set the 'origin' remote in satellite actions
- Always set the 'origin' remote in satellite actions
- Write authorized_keys in tmp/ during tests
- Write authorized_keys in tmp/ during tests
...
...
lib/gitlab/git_access.rb
View file @
f12d6278
...
@@ -49,11 +49,11 @@ module Gitlab
...
@@ -49,11 +49,11 @@ module Gitlab
# Iterate over all changes to find if user allowed all of them to be applied
# Iterate over all changes to find if user allowed all of them to be applied
changes
.
each
do
|
change
|
changes
.
each
do
|
change
|
oldrev
,
newrev
,
ref
=
change
s
.
split
(
'
'
)
oldrev
,
newrev
,
ref
=
change
.
split
(
'
'
)
action
=
if
project
.
protected_branch?
(
ref
)
action
=
if
project
.
protected_branch?
(
branch_name
(
ref
)
)
# we dont allow force push to protected branch
# we dont allow force push to protected branch
if
forced_push?
(
oldrev
,
newrev
)
if
forced_push?
(
project
,
oldrev
,
newrev
)
:force_push_code_to_protected_branches
:force_push_code_to_protected_branches
# and we dont allow remove of protected branch
# and we dont allow remove of protected branch
elsif
newrev
=~
/0000000/
elsif
newrev
=~
/0000000/
...
@@ -61,7 +61,7 @@ module Gitlab
...
@@ -61,7 +61,7 @@ module Gitlab
else
else
:push_code_to_protected_branches
:push_code_to_protected_branches
end
end
elsif
project
.
repository
&&
project
.
repository
.
tag_names
.
include?
(
ref
)
elsif
project
.
repository
&&
project
.
repository
.
tag_names
.
include?
(
tag_name
(
ref
)
)
# Prevent any changes to existing git tag unless user has permissions
# Prevent any changes to existing git tag unless user has permissions
:admin_project
:admin_project
else
else
...
@@ -77,7 +77,7 @@ module Gitlab
...
@@ -77,7 +77,7 @@ module Gitlab
true
true
end
end
def
forced_push?
(
oldrev
,
newrev
)
def
forced_push?
(
project
,
oldrev
,
newrev
)
return
false
if
project
.
empty_repo?
return
false
if
project
.
empty_repo?
if
oldrev
!~
/00000000/
&&
newrev
!~
/00000000/
if
oldrev
!~
/00000000/
&&
newrev
!~
/00000000/
...
@@ -93,5 +93,23 @@ module Gitlab
...
@@ -93,5 +93,23 @@ module Gitlab
def
user_allowed?
(
user
)
def
user_allowed?
(
user
)
Gitlab
::
UserAccess
.
allowed?
(
user
)
Gitlab
::
UserAccess
.
allowed?
(
user
)
end
end
def
branch_name
(
ref
)
ref
=
ref
.
to_s
if
ref
.
start_with?
(
'refs/heads'
)
ref
.
sub
(
%r{
\A
refs/heads/}
,
''
)
else
nil
end
end
def
tag_name
(
ref
)
ref
=
ref
.
to_s
if
ref
.
start_with?
(
'refs/tags'
)
ref
.
sub
(
%r{
\A
refs/tags/}
,
''
)
else
nil
end
end
end
end
end
end
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