Merge remote-tracking branch 'upstream/pull/2038'

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 021a4c25d269f8fe62c509527ba688b6100ec281..54da2813912d51396cdea479f6d0a219823eab78 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -6,5 +6,8 @@ ActionMailer::Base.smtp_settings = {
   :enable_starttls_auto => false
 }
 
-# Set the host and protocol for all action mailer urls
-ActionMailer::Base.default_url_options = { :host => SERVER_URL, :protocol => SERVER_PROTOCOL }
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => SERVER_URL,
+  :protocol => SERVER_PROTOCOL
+}