diff options
| -rw-r--r-- | .rubocop_todo.yml | 1 | ||||
| -rw-r--r-- | app/models/role.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 874be5b39..90ce2e23a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -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. diff --git a/app/models/role.rb b/app/models/role.rb index 7fee1b50f..0612af491 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -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} |