Update to rails 4.2.0

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 27030d541150e14534520c15f537997bd19e4c6b..9a8ef011bb59ce71610bf11bc89e37fa3c8afb65 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,6 +1,7 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
-  :address  => "localhost",
-  :port  => 25, 
-  :domain  => 'localhost',
+  :address => 'localhost',
+  :port => 25, 
+  :domain => 'localhost',
+  :enable_starttls_auto => false
 }