Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19248 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2019-11-24 12:57:50 +00:00
parent 17e05f3590
commit 404f2fb54d
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

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

30
app/models/setting.rb
View File

@@ -26,21 +26,21 @@ class Setting < ActiveRecord::Base
} }
DATE_FORMATS = [ DATE_FORMATS = [
'%Y-%m-%d', '%Y-%m-%d',
'%d/%m/%Y', '%d/%m/%Y',
'%d.%m.%Y', '%d.%m.%Y',
'%d-%m-%Y', '%d-%m-%Y',
'%m/%d/%Y', '%m/%d/%Y',
'%d %b %Y', '%d %b %Y',
'%d %B %Y', '%d %B %Y',
'%b %d, %Y', '%b %d, %Y',
'%B %d, %Y' '%B %d, %Y'
] ]
TIME_FORMATS = [ TIME_FORMATS = [
'%H:%M', '%H:%M',
'%I:%M %p' '%I:%M %p'
] ]
ENCODINGS = %w(US-ASCII ENCODINGS = %w(US-ASCII
windows-1250 windows-1250
@@ -150,8 +150,12 @@ class Setting < ActiveRecord::Base
def self.validate_all_from_params(settings) def self.validate_all_from_params(settings)
messages = [] messages = []
[ [
[:mail_handler_enable_regex_delimiters, :mail_handler_body_delimiters, /[\r\n]+/], [:mail_handler_enable_regex_delimiters,
[:mail_handler_enable_regex_excluded_filenames, :mail_handler_excluded_filenames, /\s*,\s*/] :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| ].each do |enable_regex, regex_field, delimiter|
if settings.key?(regex_field) || settings.key?(enable_regex) if settings.key?(regex_field) || settings.key?(enable_regex)
regexp = Setting.send("#{enable_regex}?") regexp = Setting.send("#{enable_regex}?")