diff options
author | Rémy Coutable <remy@rymai.me> | 2016-12-13 21:34:44 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-13 21:34:44 +0000 |
commit | dedcff485ce9fd8ccbfef6c523a79309d9db838a (patch) | |
tree | 43cfec8e6b71a6a24a74c8830eb8b76eafa689a5 /app | |
parent | 632450a4bd95c7f67f9968e57b317dc4b4704f5f (diff) | |
parent | 8c639ac23ce67b763cabf3aed4b020f4b961f9be (diff) | |
download | gitlab-ce-dedcff485ce9fd8ccbfef6c523a79309d9db838a.tar.gz |
Merge branch 'backport/group-policies' into 'master'
Backport hooks on group policies for the EE-specific implementation
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/822#note_19955431
See merge request !8066
Diffstat (limited to 'app')
-rw-r--r-- | app/policies/group_member_policy.rb | 6 | ||||
-rw-r--r-- | app/policies/group_policy.rb | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/app/policies/group_member_policy.rb b/app/policies/group_member_policy.rb index 62335527654..5a3fe814b77 100644 --- a/app/policies/group_member_policy.rb +++ b/app/policies/group_member_policy.rb @@ -15,5 +15,11 @@ class GroupMemberPolicy < BasePolicy elsif @user == target_user can! :destroy_group_member end + + additional_rules! + end + + def additional_rules! + # This is meant to be overriden in EE end end diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index b65fb68cd88..6f943feb2a7 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -33,6 +33,8 @@ class GroupPolicy < BasePolicy if globally_viewable && @subject.request_access_enabled && !member can! :request_access end + + additional_rules!(master) end def can_read_group? @@ -43,4 +45,8 @@ class GroupPolicy < BasePolicy GroupProjectsFinder.new(@subject).execute(@user).any? end + + def additional_rules!(master) + # This is meant to be overriden in EE + end end |