Commit 6b11b56a authored by Małgorzata Ksionek's avatar Małgorzata Ksionek

Update policies regarding of setting

parent e5f5a4d3
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment