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

git-svn-id: http://svn.redmine.org/redmine/trunk@18559 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5408d3ea0fbcdf79d0ecbb19e6ae255934c6c481..43e610f4b3258920859bce4f12938bd517e61de0 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -180,7 +180,6 @@ Layout/EmptyLinesAroundArguments:
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'app/models/setting.rb'
     - 'db/schema.rb'
     - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
     - 'test/functional/issues_controller_test.rb'

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 384b6e866536608fe3d8a27df3831c6b8cb25b6f..ab11360772af5da04a6b8e396ae395282527882f 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -150,11 +150,9 @@ 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*/]
     ].each do |enable_regex, regex_field, delimiter|
-
       if settings.key?(regex_field) || settings.key?(enable_regex)
         regexp = Setting.send("#{enable_regex}?")
         if settings.key?(enable_regex)
@@ -171,7 +169,6 @@ class Setting < ActiveRecord::Base
         end
       end
     end
-
     if settings.key?(:mail_from)
       begin
         mail_from = Mail::Address.new(settings[:mail_from])