Commit bd547493 authored by Drew Blessing's avatar Drew Blessing

Remove now unnecessary `additional_rules!` method from GroupPolicy

The intention was for this to be used to override group policy in
EE. This led to all sort of strange problems in practice - for
example, https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1025
needed to override `owner` permissions, but `additional_rules!`
passed `master` only. The better solution is to use an EE
module to override the policy. Removing this now defunct method.
parent 509ff2ab
...@@ -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