summaryrefslogtreecommitdiff
path: root/app/policies
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-03-02 23:23:34 +0000
committerDouwe Maan <douwe@gitlab.com>2017-03-02 23:23:34 +0000
commitefff35e96873bd3bea0afceb1d3cd102280813f5 (patch)
treecbc3fdf9e9254939917269d11e6811404a71d61f /app/policies
parent9398f64563bd4526a1ba3e20765d8791898990fc (diff)
parentbd5474937c9b4368b884242c265810cd19d3bce0 (diff)
downloadgitlab-ce-efff35e96873bd3bea0afceb1d3cd102280813f5.tar.gz
Merge branch 'remove_group_policy_add_rules' into 'master'
Remove now unnecessary `additional_rules!` method from GroupPolicy See merge request !9595
Diffstat (limited to 'app/policies')
-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