kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'remove_group_policy_add_rules' into 'master' 

Remove now unnecessary `additional_rules!` method from GroupPolicy

See merge request !9595
This commit is contained in:
Douwe Maan 2017-03-02 23:23:34 +00:00
parent 9398f64563 bd5474937c
commit efff35e968
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/policies/group_policy.rb
View File

@ -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
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