Browse Source

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

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

+ 0
- 1
.rubocop_todo.yml View File

@@ -149,7 +149,6 @@ Layout/IndentFirstArgument:
# SupportedStyles: special_inside_parentheses, consistent, align_brackets
Layout/IndentFirstArrayElement:
Exclude:
- 'app/models/setting.rb'
- 'lib/redmine/nested_set/issue_nested_set.rb'
- 'lib/redmine/nested_set/project_nested_set.rb'
- 'lib/redmine/wiki_formatting/textile/redcloth3.rb'

+ 17
- 13
app/models/setting.rb View File

@@ -26,21 +26,21 @@ class Setting < ActiveRecord::Base
}

DATE_FORMATS = [
'%Y-%m-%d',
'%d/%m/%Y',
'%d.%m.%Y',
'%d-%m-%Y',
'%m/%d/%Y',
'%d %b %Y',
'%d %B %Y',
'%b %d, %Y',
'%B %d, %Y'
]
'%Y-%m-%d',
'%d/%m/%Y',
'%d.%m.%Y',
'%d-%m-%Y',
'%m/%d/%Y',
'%d %b %Y',
'%d %B %Y',
'%b %d, %Y',
'%B %d, %Y'
]

TIME_FORMATS = [
'%H:%M',
'%I:%M %p'
]
]

ENCODINGS = %w(US-ASCII
windows-1250
@@ -150,8 +150,12 @@ 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_excluded_filenames, :mail_handler_excluded_filenames, /\s*,\s*/]
[: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)
regexp = Setting.send("#{enable_regex}?")

Loading…
Cancel
Save