summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop_todo.yml1
-rw-r--r--app/models/setting.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index edaa71abe..18ae18f4a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -23,7 +23,6 @@ Layout/AccessModifierIndentation:
- 'app/controllers/timelog_controller.rb'
- 'app/controllers/wiki_controller.rb'
- 'app/models/role.rb'
- - 'app/models/setting.rb'
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, IndentationWidth.
diff --git a/app/models/setting.rb b/app/models/setting.rb
index c9061bb3f..ec0bad0f2 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -302,7 +302,7 @@ class Setting < ActiveRecord::Base
load_available_settings
load_plugin_settings
-private
+ private
def force_utf8_strings(arg)
if arg.is_a?(String)