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

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 5cb4ce04e1fb60e43eb4013d02871312f341e590..3921912594d156f3e54b1b7ac139aa444b534c20 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -7,10 +7,10 @@ ActionMailer::Base.smtp_settings = {
   :port => Settings.smtp_port,
   :domain => Settings.smtp_domain,
   :enable_starttls_auto => Settings.smtp_enable_starttls_auto,
   :port => Settings.smtp_port,
   :domain => Settings.smtp_domain,
   :enable_starttls_auto => Settings.smtp_enable_starttls_auto,

+  :openssl_verify_mode => Settings.smtp_tls_verify_mode,

   :authentication => Settings.smtp_authentication,
   :user_name => Settings.smtp_user_name,
   :authentication => Settings.smtp_authentication,
   :user_name => Settings.smtp_user_name,

-  :password => Settings.smtp_password,
-  :openssl_verify_mode => OpenSSL::SSL::VERIFY_NONE
+  :password => Settings.smtp_password

 }
 
 # Set the host and protocol for all ActionMailer URLs
 }
 
 # Set the host and protocol for all ActionMailer URLs