diff options
| author | Pedro Adame Vergara <pedro.a.1smr@gmail.com> | 2016-05-09 20:37:18 +0200 |
|---|---|---|
| committer | Pedro Adame Vergara <pedro.a.1smr@gmail.com> | 2016-05-09 21:20:29 +0200 |
| commit | 7cffd6b372369e93ef74c01229a0507d4086e169 (patch) | |
| tree | 8797995aecdb4491990ab3b3e989b3d6b625a47a /actionmailer | |
| parent | 2399cfe23e40825229a498a81341beb85a077069 (diff) | |
| download | rails-7cffd6b372369e93ef74c01229a0507d4086e169.tar.gz rails-7cffd6b372369e93ef74c01229a0507d4086e169.tar.bz2 rails-7cffd6b372369e93ef74c01229a0507d4086e169.zip | |
Add :ssl/:tls to ActionMailer [ci skip]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 4bb7842297..10ee5490c3 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -392,6 +392,7 @@ module ActionMailer # of an OpenSSL verify constant (<tt>'none'</tt>, <tt>'peer'</tt>, <tt>'client_once'</tt>, # <tt>'fail_if_no_peer_cert'</tt>) or directly the constant (<tt>OpenSSL::SSL::VERIFY_NONE</tt>, # <tt>OpenSSL::SSL::VERIFY_PEER</tt>, ...). + # <tt>:ssl/:tls</tt> Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection) # # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method. # * <tt>:location</tt> - The location of the sendmail executable. Defaults to <tt>/usr/sbin/sendmail</tt>. |