diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 378e5dd08..f4b88e3a3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -34,7 +34,6 @@ Layout/AlignArguments: # Cop supports --auto-correct. Layout/AlignArray: Exclude: - - 'app/models/setting.rb' - 'lib/redmine/default_data/loader.rb' # Cop supports --auto-correct. diff --git a/app/models/setting.rb b/app/models/setting.rb index 236ea0f55..c9061bb3f 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -43,7 +43,7 @@ class Setting < ActiveRecord::Base '%I:%M %p' ] - ENCODINGS = %w(US-ASCII + ENCODINGS = %w(US-ASCII windows-1250 windows-1251 windows-1252