From de58cb9ca02037b4df2fc2f14040503026ddf5b7 Mon Sep 17 00:00:00 2001
From: Max Woolf <mwoolf@gitlab.com>
Date: Mon, 18 Oct 2021 10:12:27 +0100
Subject: [PATCH] Allow maintainers to set MR approval settings
As part of the new MR approval setting functionality
we accidentally removed project maintainers access
to set the settings.
This was discovered during flag roll-out and this
commit fixes the issue so rollout can continue.
Changelog: fixed
EE: true
---
ee/app/policies/ee/project_policy.rb | 2 +-
ee/spec/policies/project_policy_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 6a76e2815eab204a..8856a545351f09b4 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -392,7 +392,7 @@ module ProjectPolicy
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
end
end
diff --git a/ee/spec/policies/project_policy_spec.rb b/ee/spec/policies/project_policy_spec.rb
index 8a524168a5f26bb5..a62a10b85343b3f1 100644
--- a/ee/spec/policies/project_policy_spec.rb
+++ b/ee/spec/policies/project_policy_spec.rb
@@ -1414,7 +1414,7 @@
:reporter | true | false
:developer | true | false
:maintainer | false | false
- :maintainer | true | false
+ :maintainer | true | true
:owner | false | false
:owner | true | true
:admin | true | true
--
GitLab