Browse Source

code cleanup: rubocop: fix Layout/MultilineArrayBraceLayout in app/models/setting.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18795 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Toshi MARUYAMA 4 years ago
parent
commit
e57b7fd4c0
2 changed files with 2 additions and 2 deletions
  1. 0
    1
      .rubocop_todo.yml
  2. 2
    1
      app/models/setting.rb

+ 0
- 1
.rubocop_todo.yml View File

@@ -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.

+ 2
- 1
app/models/setting.rb View File

@@ -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)

Loading…
Cancel
Save