git-svn-id: http://svn.redmine.org/redmine/trunk@18829 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/4.1.0
@@ -19,7 +19,6 @@ Bundler/OrderedGems: | |||
Layout/AccessModifierIndentation: | |||
Exclude: | |||
- 'app/controllers/wiki_controller.rb' | |||
- 'app/models/role.rb' | |||
# Cop supports --auto-correct. | |||
# Configuration parameters: EnforcedStyle, IndentationWidth. |
@@ -280,7 +280,7 @@ class Role < ActiveRecord::Base | |||
find_or_create_system_role(BUILTIN_ANONYMOUS, 'Anonymous') | |||
end | |||
private | |||
private | |||
def allowed_permissions | |||
@allowed_permissions ||= permissions + Redmine::AccessControl.public_permissions.collect {|p| p.name} |