Commit efff35e9 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'remove_group_policy_add_rules' into 'master'

Remove now unnecessary `additional_rules!` method from GroupPolicy

See merge request !9595
parents 9398f645 bd547493
...@@ -33,8 +33,6 @@ class GroupPolicy < BasePolicy ...@@ -33,8 +33,6 @@ class GroupPolicy < BasePolicy
if globally_viewable && @subject.request_access_enabled && !member if globally_viewable && @subject.request_access_enabled && !member
can! :request_access can! :request_access
end end
additional_rules!(master)
end end
def can_read_group? def can_read_group?
...@@ -45,8 +43,4 @@ class GroupPolicy < BasePolicy ...@@ -45,8 +43,4 @@ class GroupPolicy < BasePolicy
GroupProjectsFinder.new(@subject).execute(@user).any? GroupProjectsFinder.new(@subject).execute(@user).any?
end end
def additional_rules!(master)
# This is meant to be overriden in EE
end
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