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
6b11b56a
Commit
6b11b56a
authored
Jan 22, 2020
by
Małgorzata Ksionek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update policies regarding of setting
parent
e5f5a4d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/policies/ee/project_policy.rb
ee/app/policies/ee/project_policy.rb
+3
-3
ee/spec/policies/project_policy_spec.rb
ee/spec/policies/project_policy_spec.rb
+3
-3
No files found.
ee/app/policies/ee/project_policy.rb
View file @
6b11b56a
...
...
@@ -319,15 +319,15 @@ module EE
prevent
:read_project
end
rule
{
owner_cannot_modify_approvers_rules
&
~
admin
}.
policy
do
rule
{
owner_cannot_modify_approvers_rules
}.
policy
do
prevent
:modify_approvers_rules
end
rule
{
owner_cannot_modify_merge_request_author_setting
&
~
admin
}.
policy
do
rule
{
owner_cannot_modify_merge_request_author_setting
}.
policy
do
prevent
:modify_merge_request_author_setting
end
rule
{
owner_cannot_modify_merge_request_commiter_setting
&
~
admin
}.
policy
do
rule
{
owner_cannot_modify_merge_request_commiter_setting
}.
policy
do
prevent
:modify_merge_request_commiter_setting
end
...
...
ee/spec/policies/project_policy_spec.rb
View file @
6b11b56a
...
...
@@ -1220,15 +1220,15 @@ describe ProjectPolicy do
using
RSpec
::
Parameterized
::
TableSyntax
context
'with merge request approvers rules available in license'
do
where
(
:role
,
:setting
,
:allowed
)
do
:guest
|
true
|
false
:guest
|
true
|
false
:reporter
|
true
|
false
:developer
|
true
|
false
:maintainer
|
false
|
true
:maintainer
|
true
|
false
:owner
|
false
|
true
:owner
|
true
|
false
:admin
|
true
|
true
:admin
|
false
|
true
:admin
|
true
|
false
end
with_them
do
...
...
@@ -1247,7 +1247,7 @@ describe ProjectPolicy do
context
'with merge request approvers not available in license'
do
where
(
:role
,
:setting
,
:allowed
)
do
:guest
|
true
|
false
:guest
|
true
|
false
:reporter
|
true
|
false
:developer
|
true
|
false
:maintainer
|
false
|
true
...
...
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