Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
cc1cebdc
Commit
cc1cebdc
authored
8 years ago
by
Timothy Andrew
Browse files
Options
Download
Email Patches
Plain Diff
Admins count as masters too.
1. In the context of protected branches. 2. Test this behaviour.
parent
4d6dadc8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
10 deletions
+36
-10
app/models/project_team.rb
app/models/project_team.rb
+8
-0
app/models/protected_branch/merge_access_level.rb
app/models/protected_branch/merge_access_level.rb
+2
-2
app/models/protected_branch/push_access_level.rb
app/models/protected_branch/push_access_level.rb
+2
-2
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+24
-6
No files found.
app/models/project_team.rb
View file @
cc1cebdc
...
...
@@ -118,6 +118,14 @@ class ProjectTeam
max_member_access
(
user
.
id
)
==
Gitlab
::
Access
::
MASTER
end
def
master_or_greater?
(
user
)
master?
(
user
)
||
user
.
is_admin?
end
def
developer_or_greater?
(
user
)
master_or_greater?
(
user
)
||
developer?
(
user
)
end
def
member?
(
user
,
min_member_access
=
nil
)
member
=
!!
find_member
(
user
.
id
)
...
...
This diff is collapsed.
Click to expand it.
app/models/protected_branch/merge_access_level.rb
View file @
cc1cebdc
...
...
@@ -13,9 +13,9 @@ class ProtectedBranch::MergeAccessLevel < ActiveRecord::Base
def
check_access
(
user
)
if
masters?
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
master?
(
user
)
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
master
_or_greater
?
(
user
)
elsif
developers?
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
master?
(
user
)
||
project
.
team
.
develop
er?
(
user
)
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
developer_or_great
er?
(
user
)
end
end
...
...
This diff is collapsed.
Click to expand it.
app/models/protected_branch/push_access_level.rb
View file @
cc1cebdc
...
...
@@ -14,9 +14,9 @@ class ProtectedBranch::PushAccessLevel < ActiveRecord::Base
def
check_access
(
user
)
if
masters?
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
master?
(
user
)
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
master
_or_greater
?
(
user
)
elsif
developers?
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
master?
(
user
)
||
project
.
team
.
develop
er?
(
user
)
user
.
can?
(
:push_code
,
project
)
if
project
.
team
.
developer_or_great
er?
(
user
)
elsif
no_one?
false
end
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/git_access_spec.rb
View file @
cc1cebdc
...
...
@@ -151,7 +151,13 @@ describe Gitlab::GitAccess, lib: true do
def
self
.
run_permission_checks
(
permissions_matrix
)
permissions_matrix
.
keys
.
each
do
|
role
|
describe
"
#{
role
}
access"
do
before
{
project
.
team
<<
[
user
,
role
]
}
before
do
if
role
==
:admin
user
.
update_attribute
(
:admin
,
true
)
else
project
.
team
<<
[
user
,
role
]
end
end
permissions_matrix
[
role
].
each
do
|
action
,
allowed
|
context
action
do
...
...
@@ -165,6 +171,17 @@ describe Gitlab::GitAccess, lib: true do
end
permissions_matrix
=
{
admin:
{
push_new_branch:
true
,
push_master:
true
,
push_protected_branch:
true
,
push_remove_protected_branch:
false
,
push_tag:
true
,
push_new_tag:
true
,
push_all:
true
,
merge_into_protected_branch:
true
},
master:
{
push_new_branch:
true
,
push_master:
true
,
...
...
@@ -257,13 +274,14 @@ describe Gitlab::GitAccess, lib: true do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
true
,
push_all:
true
,
merge_into_protected_branch:
true
}))
end
end
context
"when no one is allowed to push to the
#{
protected_branch_name
}
protected branch"
do
before
{
create
(
:protected_branch
,
:no_one_can_push
,
name:
protected_branch_name
,
project:
project
)
}
context
"when no one is allowed to push to the
#{
protected_branch_name
}
protected branch"
do
before
{
create
(
:protected_branch
,
:no_one_can_push
,
name:
protected_branch_name
,
project:
project
)
}
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
},
master:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
}))
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
},
master:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
},
admin:
{
push_protected_branch:
false
,
push_all:
false
,
merge_into_protected_branch:
false
}))
end
end
end
...
...
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