Skip to content

Commit

Permalink
Mirror STARTTLS changes for action_mailer test stub
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//src/ar_mailer/dev/": change = 5264]
  • Loading branch information
drbrain committed Jun 24, 2009
1 parent e3026cb commit 8fc5d5d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/action_mailer/ar_sendmail.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'optparse'
require 'net/smtp'
require 'rubygems'
require 'openssl'
begin
require 'smtp_tls'
rescue LoadError
Expand Down
5 changes: 4 additions & 1 deletion test/action_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
require 'net/smtp'
require 'smtp_tls'
begin
require 'smtp_tls'
rescue LoadError
end
require 'time'

class Net::SMTP
Expand Down

0 comments on commit 8fc5d5d

Please sign in to comment.