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.rb | |
| 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.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 1c08d3843a..0221e36bb0 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -31,15 +31,13 @@ module ActionMailer extend ::ActiveSupport::Autoload autoload :AdvAttrAccessor - autoload :DeprecatedBody autoload :Base autoload :DeliveryMethod + autoload :DeprecatedBody autoload :MailHelper - autoload :Part - autoload :PartContainer autoload :Quoting + autoload :TestCase autoload :TestHelper - end module Text @@ -48,12 +46,4 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end -module Net - extend ActiveSupport::Autoload - - autoload :SMTP -end - - -gem 'mail', '>= 1.4.1' -require 'mail' +require 'mail'
\ No newline at end of file |