Commit 9573d754 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'mw/mr-approval-settings-permissions-bug' into 'master'

Allow maintainers to set MR approval settings

See merge request gitlab-org/gitlab!72493
parents 0c5eca15 de58cb9c
...@@ -392,7 +392,7 @@ module EE ...@@ -392,7 +392,7 @@ module EE
rule { auditor | can?(:developer_access) }.enable :add_project_to_instance_security_dashboard rule { auditor | can?(:developer_access) }.enable :add_project_to_instance_security_dashboard
rule { (admin | owner) & group_merge_request_approval_settings_enabled }.policy do rule { (admin | maintainer) & group_merge_request_approval_settings_enabled }.policy do
enable :admin_merge_request_approval_settings enable :admin_merge_request_approval_settings
end end
end end
......
...@@ -1414,7 +1414,7 @@ RSpec.describe ProjectPolicy do ...@@ -1414,7 +1414,7 @@ RSpec.describe ProjectPolicy do
:reporter | true | false :reporter | true | false
:developer | true | false :developer | true | false
:maintainer | false | false :maintainer | false | false
:maintainer | true | false :maintainer | true | true
:owner | false | false :owner | false | false
:owner | true | true :owner | true | true
:admin | true | true :admin | true | 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