From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 24 Nov 2019 12:57:50 +0000 (+0000)
Subject: cleanup: rubocop: fix Layout/IndentFirstArrayElement in app/models/setting.rb
X-Git-Tag: 4.2.0~1392
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=404f2fb54da8604168ed6011b5fbddc5fe5b8a95;p=redmine.git

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a409a4634..c19fe8f3f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -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'
diff --git a/app/models/setting.rb b/app/models/setting.rb
index d4e11c355..7fdd79a41 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -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}?")