Browse Source

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
tags/4.1.0
Toshi MARUYAMA 4 years ago
parent
commit
ca411ddca7
2 changed files with 0 additions and 4 deletions
  1. 0
    1
      .rubocop_todo.yml
  2. 0
    3
      app/models/setting.rb

+ 0
- 1
.rubocop_todo.yml View File

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

+ 0
- 3
app/models/setting.rb View File

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

Loading…
Cancel
Save