aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorMarcus Mateus <marcus@simplitex.com>2009-02-24 10:47:50 -0600
committerJoshua Peek <josh@joshpeek.com>2009-02-24 10:47:50 -0600
commit5c684f518feeaf38961f976b966e57abf386e248 (patch)
tree8774ae21d9532fdfe534a213c98bf52c0e11b8f5 /actionmailer/lib
parent85df4841ddb3db3970fa9e798de698cf6f16752a (diff)
downloadrails-5c684f518feeaf38961f976b966e57abf386e248.tar.gz
rails-5c684f518feeaf38961f976b966e57abf386e248.tar.bz2
rails-5c684f518feeaf38961f976b966e57abf386e248.zip
Just require tmail instead of autoloading it to fix issues when using the gem
version [#1851 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 45fcab599c..02c536c8ad 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -58,4 +58,5 @@ module Net
end
autoload :MailHelper, 'action_mailer/mail_helper'
-autoload :TMail, 'action_mailer/vendor/tmail'
+
+require 'action_mailer/vendor/tmail'