diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-27 12:09:20 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-27 12:09:20 +0100 |
| commit | 47e5caa96bffc04c8c0b287a975a609fb048e530 (patch) | |
| tree | 653d360dc9ad7eb7c5d2338840e15ab8b28a902b /actionmailer/lib/action_mailer/delivery_method | |
| parent | fd58a2d1da04508a7fdf825143e61d186112e63e (diff) | |
| parent | d92c4a84023bc0c8dd75869c9b4d5e50277f4650 (diff) | |
| download | rails-47e5caa96bffc04c8c0b287a975a609fb048e530.tar.gz rails-47e5caa96bffc04c8c0b287a975a609fb048e530.tar.bz2 rails-47e5caa96bffc04c8c0b287a975a609fb048e530.zip | |
Merge Mail with latest Rails and move mail gem to Gemfile.
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_method')
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_method/smtp.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_method/smtp.rb b/actionmailer/lib/action_mailer/delivery_method/smtp.rb index 9622dbb93a..af30c498b5 100644 --- a/actionmailer/lib/action_mailer/delivery_method/smtp.rb +++ b/actionmailer/lib/action_mailer/delivery_method/smtp.rb @@ -1,8 +1,9 @@ +require 'net/smtp' + module ActionMailer module DeliveryMethod # A delivery method implementation which sends via smtp. class Smtp < Method - self.settings = { :address => "localhost", :port => 25, @@ -25,6 +26,5 @@ module ActionMailer end end end - end end |