Commit 955673a9 authored by Doug Stull's avatar Doug Stull

Merge branch...

Merge branch '336591-maintainers-should-not-be-able-to-set-the-project-compliance-framework-label' into 'master'

Fix: Maintainers should not be able to set the project compliance framework label

See merge request gitlab-org/gitlab!66745
parents 8937d59a bbcc3fcc
...@@ -373,7 +373,7 @@ module EE ...@@ -373,7 +373,7 @@ module EE
rule { quality_management_available & can?(:reporter_access) & can?(:create_issue) }.enable :create_test_case rule { quality_management_available & can?(:reporter_access) & can?(:create_issue) }.enable :create_test_case
rule { compliance_framework_available & can?(:maintainer_access) }.enable :admin_compliance_framework rule { compliance_framework_available & can?(:owner_access) }.enable :admin_compliance_framework
rule { status_page_available & can?(:owner_access) }.enable :mark_issue_for_publication rule { status_page_available & can?(:owner_access) }.enable :mark_issue_for_publication
rule { status_page_available & can?(:developer_access) }.enable :publish_status_page rule { status_page_available & can?(:developer_access) }.enable :publish_status_page
......
...@@ -1476,7 +1476,7 @@ RSpec.describe ProjectPolicy do ...@@ -1476,7 +1476,7 @@ RSpec.describe ProjectPolicy do
:reporter | true | nil | false :reporter | true | nil | false
:developer | false | nil | false :developer | false | nil | false
:maintainer | false | nil | false :maintainer | false | nil | false
:maintainer | true | nil | true :maintainer | true | nil | false
:owner | false | nil | false :owner | false | nil | false
:owner | true | nil | true :owner | true | nil | true
:admin | false | false | false :admin | false | false | false
......
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