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

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 6a42c6dfebd8fedc29cc8e6599de6d4fc5585264..54da2813912d51396cdea479f6d0a219823eab78 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,7 +1,13 @@
 # Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
-  :address => 'localhost',
+  :address => "localhost",
   :port => 25,
-  :domain => 'localhost',
+  :domain => "localhost",
   :enable_starttls_auto => false
 }
+
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => SERVER_URL,
+  :protocol => SERVER_PROTOCOL
+}