diff options
Diffstat (limited to 'actionmailer/lib')
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/mail_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 5a24b0861e..40ad6f15e8 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -38,7 +38,7 @@ require 'action_mailer/base' require 'action_mailer/helpers' require 'action_mailer/mail_helper' require 'action_mailer/quoting' -require 'action_mailer/vendor/tmail' +require 'tmail' require 'net/smtp' ActionMailer::Base.class_eval do diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb index 0235fcdc61..9c7370065f 100644 --- a/actionmailer/lib/action_mailer/mail_helper.rb +++ b/actionmailer/lib/action_mailer/mail_helper.rb @@ -1,4 +1,4 @@ -require 'action_mailer/vendor/text/format' +require 'text/format' module MailHelper#:nodoc: def block_format(text) @@ -14,4 +14,4 @@ module MailHelper#:nodoc: formatted end -end
\ No newline at end of file +end |