diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2016-05-10 00:53:33 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2016-05-10 00:53:33 +0530 |
| commit | eff5784274725ad1e1a406b9c182d317ee3ed243 (patch) | |
| tree | 4045ecee04e94f166e56c4918c8de695f5b8e84d | |
| parent | 288c01fc5f09a052918c3378a209063a44dab73e (diff) | |
| parent | 7cffd6b372369e93ef74c01229a0507d4086e169 (diff) | |
| download | rails-eff5784274725ad1e1a406b9c182d317ee3ed243.tar.gz rails-eff5784274725ad1e1a406b9c182d317ee3ed243.tar.bz2 rails-eff5784274725ad1e1a406b9c182d317ee3ed243.zip | |
Merge pull request #24937 from pedroadame/master
Add :ssl/:tls to ActionMailer rdoc [ci skip]
| -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>. |