Commit dedcff48 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 632450a4 8c639ac2
Pipeline #5384806 failed with stages
in 77 minutes and 8 seconds
......@@ -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
......@@ -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
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