From 15d7cac282e29f0a8e7b38dade07abb32d97a991 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 12 Nov 2009 16:08:50 +1100 Subject: Starting again on actionmailer integration with mail --- actionmailer/lib/action_mailer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 23f04a11ba..006e865cf1 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -53,4 +53,5 @@ end autoload :MailHelper, 'action_mailer/mail_helper' -require 'action_mailer/vendor/tmail' +require '/Users/mikel/ruby_programs/mail/lib/mail' +require 'action_mailer/vendor/tmail_compat' -- cgit v1.2.3 From 747d56881a07d4636fbaceb1542579d5e02daddd Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 22 Nov 2009 23:20:57 +1100 Subject: 131 tests, 309 assertions, 0 failures, 0 errors --- actionmailer/lib/action_mailer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 006e865cf1..9281008cd4 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -41,6 +41,7 @@ module ActionMailer autoload :TestCase, 'action_mailer/test_case' autoload :TestHelper, 'action_mailer/test_helper' autoload :Utils, 'action_mailer/utils' + end module Text @@ -53,5 +54,5 @@ end autoload :MailHelper, 'action_mailer/mail_helper' + require '/Users/mikel/ruby_programs/mail/lib/mail' -require 'action_mailer/vendor/tmail_compat' -- cgit v1.2.3 From 06c5270343ba1078875daeb1eeacb125ef168a43 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 22 Nov 2009 23:34:39 +1100 Subject: Adding mail as a gem load --- actionmailer/lib/action_mailer.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 9281008cd4..d3dd3daa2d 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -54,5 +54,4 @@ end autoload :MailHelper, 'action_mailer/mail_helper' - -require '/Users/mikel/ruby_programs/mail/lib/mail' +gem 'mail', '>= 1.2.8' -- cgit v1.2.3 From 3cb46b40a0df1a1f4912625cc2be40b3d630f1f3 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 22 Nov 2009 23:36:30 +1100 Subject: Opps.. need to require it as well as gem mail :) --- actionmailer/lib/action_mailer.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index d3dd3daa2d..3eb385d3b0 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -55,3 +55,4 @@ end autoload :MailHelper, 'action_mailer/mail_helper' gem 'mail', '>= 1.2.8' +require 'mail' \ No newline at end of file -- cgit v1.2.3 From a6eed86c33fbd074a08b76a678e968f521cf37b0 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 23 Nov 2009 20:50:49 +1100 Subject: Removing utils, and updating requires to match --- actionmailer/lib/action_mailer.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 3eb385d3b0..15555af19e 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -40,7 +40,6 @@ module ActionMailer autoload :Quoting, 'action_mailer/quoting' autoload :TestCase, 'action_mailer/test_case' autoload :TestHelper, 'action_mailer/test_helper' - autoload :Utils, 'action_mailer/utils' end @@ -54,5 +53,5 @@ end autoload :MailHelper, 'action_mailer/mail_helper' -gem 'mail', '>= 1.2.8' -require 'mail' \ No newline at end of file +gem 'mail', '>= 1.2.9' +require 'mail' -- cgit v1.2.3 From 3a72923e27195983d37bdb39ef26b29cf03d3483 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Tue, 24 Nov 2009 09:38:00 +1100 Subject: Change require mail version to 1.3.0 --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 15555af19e..41ed399308 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -53,5 +53,5 @@ end autoload :MailHelper, 'action_mailer/mail_helper' -gem 'mail', '>= 1.2.9' +gem 'mail', '>= 1.3.0' require 'mail' -- cgit v1.2.3 From c1304098cca8a9247a9ad1461a1a343354650843 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Wed, 2 Dec 2009 20:01:01 -0800 Subject: Reorganize autoloads: * A new module (ActiveSupport::Autoload) is provide that extends autoloading with new behavior. * All autoloads in modules that have extended ActiveSupport::Autoload will be eagerly required in threadsafe environments * Autoloads can optionally leave off the path if the path is the same as full_constant_name.underscore * It is possible to specify that a group of autoloads live under an additional path. For instance, all of ActionDispatch's middlewares are ActionDispatch::MiddlewareName, but they live under "action_dispatch/middlewares/middleware_name" * It is possible to specify that a group of autoloads are all found at the same path. For instance, a number of exceptions might all be declared there. * One consequence of this is that testing-related constants are not autoloaded. To get the testing helpers for a given component, require "component_name/test_case". For instance, "action_controller/test_case". * test_help.rb, which is automatically required by a Rails application's test helper, requires the test_case.rb for all active components, so this change will not be disruptive in existing or new applications. --- actionmailer/lib/action_mailer.rb | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 23f04a11ba..12e781b6c3 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -25,32 +25,34 @@ actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib" $:.unshift(actionpack_path) if File.directory?(actionpack_path) require 'action_controller' require 'action_view' +require 'active_support/autoload' module ActionMailer - def self.load_all! - [Base, Part, ::Text::Format, ::Net::SMTP] - end - - autoload :AdvAttrAccessor, 'action_mailer/adv_attr_accessor' - autoload :DeprecatedBody, 'action_mailer/deprecated_body' - autoload :Base, 'action_mailer/base' - autoload :DeliveryMethod, 'action_mailer/delivery_method' - autoload :Part, 'action_mailer/part' - autoload :PartContainer, 'action_mailer/part_container' - autoload :Quoting, 'action_mailer/quoting' - autoload :TestCase, 'action_mailer/test_case' - autoload :TestHelper, 'action_mailer/test_helper' - autoload :Utils, 'action_mailer/utils' + extend ::ActiveSupport::Autoload + + autoload :AdvAttrAccessor + autoload :DeprecatedBody + autoload :Base + autoload :DeliveryMethod + autoload :MailHelper + autoload :Part + autoload :PartContainer + autoload :Quoting + autoload :TestHelper + autoload :Utils end module Text + extend ActiveSupport::Autoload + autoload :Format, 'action_mailer/vendor/text_format' end module Net - autoload :SMTP, 'net/smtp' + extend ActiveSupport::Autoload + + autoload :SMTP end -autoload :MailHelper, 'action_mailer/mail_helper' require 'action_mailer/vendor/tmail' -- cgit v1.2.3 From 96e0638ce2a287eb5c43266fb4eb3e656e9968cf Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Thu, 3 Dec 2009 09:06:01 -0800 Subject: Should fix a few Sam Ruby fails. --- actionmailer/lib/action_mailer.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 12e781b6c3..eec4040bcc 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -25,7 +25,6 @@ actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib" $:.unshift(actionpack_path) if File.directory?(actionpack_path) require 'action_controller' require 'action_view' -require 'active_support/autoload' module ActionMailer extend ::ActiveSupport::Autoload -- cgit v1.2.3 From 7ee5843c3cedfe36a680d5b28aa31eef45296c50 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 16 Dec 2009 11:56:51 -0600 Subject: Fully expand relative rails framework paths and make sure we aren't adding any to the load path more than once. --- actionmailer/lib/action_mailer.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index eec4040bcc..f439eb175c 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -21,8 +21,9 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib" -$:.unshift(actionpack_path) if File.directory?(actionpack_path) +actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__) +$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path) + require 'action_controller' require 'action_view' -- cgit v1.2.3 From 418639b4cfe477d7309fa53e8b8e2472b44bda80 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 17 Dec 2009 12:00:32 +1100 Subject: Fixes for working with 1.9.1-head --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index e7ad68e212..e8adbf0eff 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -54,5 +54,5 @@ module Net end -gem 'mail', '>= 1.3.0' +gem 'mail', '>= 1.3.2' require 'mail' -- cgit v1.2.3 From 63b124b043dec036403f9a88aeafdf99669064e0 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 17 Dec 2009 12:23:08 +1100 Subject: Merged in latest changes from rails/master --- actionmailer/lib/action_mailer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index e8adbf0eff..e7d396aca5 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -34,11 +34,12 @@ module ActionMailer autoload :DeprecatedBody autoload :Base autoload :DeliveryMethod + autoload :MailHelper autoload :Part autoload :PartContainer autoload :Quoting - autoload :TestCase autoload :TestHelper + end module Text -- cgit v1.2.3 From f176c9466381adcff70d06dbf9b81ad89f17df04 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 17 Dec 2009 12:35:07 +1100 Subject: Updating requirement for mail to 1.3.3 --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index e7d396aca5..d32d421c2c 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -55,5 +55,5 @@ module Net end -gem 'mail', '>= 1.3.2' +gem 'mail', '>= 1.3.3' require 'mail' -- cgit v1.2.3 From 8950346f8a043b5bf4dde39e527270909bf2668c Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 17 Dec 2009 13:17:35 +1100 Subject: Updating requirement for mail to 1.3.4 --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index d32d421c2c..87e1c4a1f3 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -55,5 +55,5 @@ module Net end -gem 'mail', '>= 1.3.3' +gem 'mail', '>= 1.3.4' require 'mail' -- cgit v1.2.3 From ace20bd25e3818b7f29c222643dd445c48b36425 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 22 Dec 2009 17:27:37 -0600 Subject: Flip deferrable autoload convention --- actionmailer/lib/action_mailer.rb | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index f439eb175c..6539451bea 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -30,29 +30,34 @@ require 'action_view' module ActionMailer extend ::ActiveSupport::Autoload - autoload :AdvAttrAccessor - autoload :DeprecatedBody - autoload :Base - autoload :DeliveryMethod - autoload :MailHelper - autoload :Part - autoload :PartContainer - autoload :Quoting - autoload :TestHelper - autoload :Utils + eager_autoload do + autoload :AdvAttrAccessor + autoload :DeprecatedBody + autoload :Base + autoload :DeliveryMethod + autoload :MailHelper + autoload :Part + autoload :PartContainer + autoload :Quoting + autoload :TestHelper + autoload :Utils + end end module Text extend ActiveSupport::Autoload - autoload :Format, 'action_mailer/vendor/text_format' + eager_autoload do + autoload :Format, 'action_mailer/vendor/text_format' + end end module Net extend ActiveSupport::Autoload - autoload :SMTP + eager_autoload do + autoload :SMTP + end end - require 'action_mailer/vendor/tmail' -- cgit v1.2.3 From 2e4e8d156ca1a2f3fe2f587956097621433514f8 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 22 Dec 2009 17:33:00 -0600 Subject: All AM modules are safe to defer --- actionmailer/lib/action_mailer.rb | 40 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 30 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 6539451bea..d7bbbbd78c 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -30,34 +30,14 @@ require 'action_view' module ActionMailer extend ::ActiveSupport::Autoload - eager_autoload do - autoload :AdvAttrAccessor - autoload :DeprecatedBody - autoload :Base - autoload :DeliveryMethod - autoload :MailHelper - autoload :Part - autoload :PartContainer - autoload :Quoting - autoload :TestHelper - autoload :Utils - end + autoload :AdvAttrAccessor + autoload :DeprecatedBody + autoload :Base + autoload :DeliveryMethod + autoload :MailHelper + autoload :Part + autoload :PartContainer + autoload :Quoting + autoload :TestHelper + autoload :Utils end - -module Text - extend ActiveSupport::Autoload - - eager_autoload do - autoload :Format, 'action_mailer/vendor/text_format' - end -end - -module Net - extend ActiveSupport::Autoload - - eager_autoload do - autoload :SMTP - end -end - -require 'action_mailer/vendor/tmail' -- cgit v1.2.3 From 4e1fa4912d2777cba980b4a936a89bd63d201614 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 27 Dec 2009 18:38:30 +1100 Subject: Updating actionmailer to call :to_s on all field values instead of decoded --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 87e1c4a1f3..c82efe4d6d 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -55,5 +55,5 @@ module Net end -gem 'mail', '>= 1.3.4' +gem 'mail', '>= 1.3.5' require 'mail' -- cgit v1.2.3 From 331d375cc332e9e8a30a7f9e745414769b780c54 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 27 Dec 2009 20:56:16 +1100 Subject: Changing body to use :to_s instead of :decoded... better use case --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index c82efe4d6d..6a62267d90 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -55,5 +55,5 @@ module Net end -gem 'mail', '>= 1.3.5' +gem 'mail', '>= 1.4.0' require 'mail' -- cgit v1.2.3 From fd58a2d1da04508a7fdf825143e61d186112e63e Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 27 Dec 2009 21:42:33 +1100 Subject: Updating action_mailer to need mail 1.4.1 --- actionmailer/lib/action_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 6a62267d90..1c08d3843a 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -55,5 +55,5 @@ module Net end -gem 'mail', '>= 1.4.0' +gem 'mail', '>= 1.4.1' require 'mail' -- cgit v1.2.3 From c039bcdb1c94d8b28fc9398d4b88b4453cdd9fb1 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 28 Dec 2009 12:25:14 +1100 Subject: Moved sort_parts into Mail, updated mail requirement to 1.4.2 --- actionmailer/lib/action_mailer.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 0221e36bb0..8ac6318f9e 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -24,6 +24,7 @@ actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__) $:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path) + require 'action_controller' require 'action_view' @@ -46,4 +47,4 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end -require 'mail' \ No newline at end of file +require 'mail' -- cgit v1.2.3 From 616ebb8f6a5dc38a6fe0ee497f2059a9bd78a457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 28 Dec 2009 11:21:36 +0100 Subject: Remove unused code paths and require mail only when it's needed. --- actionmailer/lib/action_mailer.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 8ac6318f9e..55ddbb24f4 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -24,7 +24,6 @@ actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__) $:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path) - require 'action_controller' require 'action_view' @@ -46,5 +45,3 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end - -require 'mail' -- cgit v1.2.3 From 345e622a20fd14a356a69da40e527075b1117b52 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Wed, 30 Dec 2009 16:12:51 +1100 Subject: Adding TMailCompat layer for :set_content_type and friends --- actionmailer/lib/action_mailer.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 55ddbb24f4..039715c2f5 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -45,3 +45,5 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end + +require 'action_mailer/tmail_compat' \ No newline at end of file -- cgit v1.2.3 From a2880827b4b023a87889138aa39f1182d0265194 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Wed, 30 Dec 2009 20:43:56 +1100 Subject: Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompat --- actionmailer/lib/action_mailer.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 039715c2f5..55ddbb24f4 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -45,5 +45,3 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end - -require 'action_mailer/tmail_compat' \ No newline at end of file -- cgit v1.2.3