diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 18ae18f4a..93f45b94c 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -210,7 +210,6 @@ Layout/MultilineArrayBraceLayout: - 'app/helpers/projects_helper.rb' - 'app/helpers/settings_helper.rb' - 'app/helpers/users_helper.rb' - - 'app/models/setting.rb' - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb' # Cop supports --auto-correct. diff --git a/app/models/setting.rb b/app/models/setting.rb index ec0bad0f2..384bb900b 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -150,7 +150,8 @@ class Setting < ActiveRecord::Base def self.validate_all_from_params(settings) messages = [] - [[:mail_handler_enable_regex_delimiters, :mail_handler_body_delimiters, /[\r\n]+/], + [ + [:mail_handler_enable_regex_delimiters, :mail_handler_body_delimiters, /[\r\n]+/], [:mail_handler_enable_regex_excluded_filenames, :mail_handler_excluded_filenames, /\s*,\s*/] ].each do |enable_regex, regex_field, delimiter| if settings.key?(regex_field) || settings.key?(enable_regex)