aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-12-29 15:49:04 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-12-29 15:49:04 -0800
commit71ffa760701d2240ece5f17b75df316611ecb3d0 (patch)
treefe899a29fcfe24f1569f8f96d4b5f5a2311df3eb /actionmailer/lib/action_mailer.rb
parent485d244eaec09579d4fcf024c51d9aa05c930f33 (diff)
parentce1aeeee3f0cb46c21b05cd89c867ed031e43e22 (diff)
downloadrails-71ffa760701d2240ece5f17b75df316611ecb3d0.tar.gz
rails-71ffa760701d2240ece5f17b75df316611ecb3d0.tar.bz2
rails-71ffa760701d2240ece5f17b75df316611ecb3d0.zip
Merge branch 'mail'
Diffstat (limited to 'actionmailer/lib/action_mailer.rb')
-rw-r--r--actionmailer/lib/action_mailer.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index d7bbbbd78c..55ddbb24f4 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -31,13 +31,17 @@ 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
- autoload :Utils
+end
+
+module Text
+ extend ActiveSupport::Autoload
+
+ autoload :Format, 'action_mailer/vendor/text_format'
end