summaryrefslogtreecommitdiff
path: root/app/policies/group_policy.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-01-11 12:14:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-01-11 12:14:06 +0000
commit22391da1261240ecc15aa15cbb19b089339902b5 (patch)
tree69aec0f82f114255cdcefcd58b37efbdfb1c7f59 /app/policies/group_policy.rb
parent1b5a83917d2ee58d168745fd5ca516a772316ce7 (diff)
downloadgitlab-ce-22391da1261240ecc15aa15cbb19b089339902b5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/policies/group_policy.rb')
-rw-r--r--app/policies/group_policy.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index 05adcd51082..fee47fe0ae9 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -123,8 +123,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
enable :read_group_member
enable :read_custom_emoji
enable :read_counts
- enable :read_crm_organization
- enable :read_crm_contact
end
rule { ~public_group & ~has_access }.prevent :read_counts
@@ -159,6 +157,8 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy
enable :read_prometheus
enable :read_package
enable :read_package_settings
+ enable :read_crm_organization
+ enable :read_crm_contact
end
rule { maintainer }.policy do