From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 21 Jul 2020 13:41:16 +0000 (+0000)
Subject: fix source indent of app/models/mailer.rb
X-Git-Tag: 4.2.0~866
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=616765b5e4c151ffeaa406da91ebded4c1100460;p=redmine.git

fix source indent of app/models/mailer.rb

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

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 590199ed8..33f48e511 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -58,9 +58,11 @@ class Mailer < ActionMailer::Base
     options = {:protocol => Setting.protocol}
     if Setting.host_name.to_s =~ /\A(https?\:\/\/)?(.+?)(\:(\d+))?(\/.+)?\z/i
       host, port, prefix = $2, $4, $5
-      options.merge!({
-        :host => host, :port => port, :script_name => prefix
-      })
+      options.merge!(
+        {
+          :host => host, :port => port, :script_name => prefix
+        }
+      )
     else
       options[:host] = Setting.host_name
     end