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

code cleanup: rubocop: fix Layout/CommentIndentation in app/models/mailer.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18772 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2019-10-19 12:25:34 +00:00
parent 7c796b96cc
commit 5e5712f82d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_todo.yml
View File

@@ -87,7 +87,6 @@ Layout/ClosingParenthesisIndentation:
# Cop supports --auto-correct. # Cop supports --auto-correct.
Layout/CommentIndentation: Layout/CommentIndentation:
Exclude: Exclude:
- 'app/models/mailer.rb'
- 'lib/redmine/wiki_formatting/textile/redcloth3.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
- 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb' - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'

4
app/models/mailer.rb
View File

@@ -643,8 +643,8 @@ class Mailer < ActionMailer::Base
from = mail_from.format from = mail_from.format
list_id = "<#{mail_from.address.to_s.tr('@', '.')}>" list_id = "<#{mail_from.address.to_s.tr('@', '.')}>"
rescue Mail::Field::IncompleteParseError rescue Mail::Field::IncompleteParseError
# Use Setting.mail_from as it is if Mail::Address cannot parse it # Use Setting.mail_from as it is if Mail::Address cannot parse it
# (probably the emission address is not RFC compliant) # (probably the emission address is not RFC compliant)
from = Setting.mail_from.to_s from = Setting.mail_from.to_s
list_id = "<#{from.tr('@', '.')}>" list_id = "<#{from.tr('@', '.')}>"
end end