summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Blessing <drew@gitlab.com>2017-02-28 13:59:30 -0600
committerDrew Blessing <drew@gitlab.com>2017-02-28 13:59:30 -0600
commitbd5474937c9b4368b884242c265810cd19d3bce0 (patch)
treebba4c8274c099fb0bfa79cbb65c6f1f10c2f0c96
parent509ff2ab170802e23646282f1d146a6383b53a66 (diff)
downloadgitlab-ce-bd5474937c9b4368b884242c265810cd19d3bce0.tar.gz
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.
-rw-r--r--app/policies/group_policy.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb
index 0be6e113655..4cc21696eb6 100644
--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -33,8 +33,6 @@ class GroupPolicy < BasePolicy
if globally_viewable && @subject.request_access_enabled && !member
can! :request_access
end
-
- additional_rules!(master)
end
def can_read_group?
@@ -45,8 +43,4 @@ class GroupPolicy < BasePolicy
GroupProjectsFinder.new(@subject).execute(@user).any?
end
-
- def additional_rules!(master)
- # This is meant to be overriden in EE
- end
end