From 5e5712f82d8c01a03af8f40a604bba6e57b8cac9 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 19 Oct 2019 12:25:34 +0000 Subject: [PATCH] code cleanup: rubocop: fix Layout/CommentIndentation in app/models/mailer.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18772 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - app/models/mailer.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c88c62e65..8d625a840 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -87,7 +87,6 @@ Layout/ClosingParenthesisIndentation: # Cop supports --auto-correct. Layout/CommentIndentation: Exclude: - - 'app/models/mailer.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb' diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 74ceaecfe..3f3b00e7c 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -643,8 +643,8 @@ class Mailer < ActionMailer::Base from = mail_from.format list_id = "<#{mail_from.address.to_s.tr('@', '.')}>" rescue Mail::Field::IncompleteParseError - # Use Setting.mail_from as it is if Mail::Address cannot parse it - # (probably the emission address is not RFC compliant) + # Use Setting.mail_from as it is if Mail::Address cannot parse it + # (probably the emission address is not RFC compliant) from = Setting.mail_from.to_s list_id = "<#{from.tr('@', '.')}>" end