aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-29 16:16:01 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-29 17:51:05 +0100
commit3f8409193716669b9fa61ac74ae1c92cfde00785 (patch)
tree0a7ff906de7b643f661c6dbfeb0b9ed5e4e38be7 /actionmailer/lib/action_mailer.rb
parent296007744525638b142501efee57faf6ac4be20f (diff)
downloadrails-3f8409193716669b9fa61ac74ae1c92cfde00785.tar.gz
rails-3f8409193716669b9fa61ac74ae1c92cfde00785.tar.bz2
rails-3f8409193716669b9fa61ac74ae1c92cfde00785.zip
ActionMailer should depend just on AbstractController.
Diffstat (limited to 'actionmailer/lib/action_mailer.rb')
-rw-r--r--actionmailer/lib/action_mailer.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 17f63aca25..0265e6e222 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -24,9 +24,17 @@
actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
-require 'action_controller'
+require 'abstract_controller'
require 'action_view'
+# Common ActiveSupport usage in ActionMailer
+require 'active_support/core_ext/class'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/array/uniq_by'
+require 'active_support/core_ext/module/attr_internal'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/inflections'
+
module ActionMailer
extend ::ActiveSupport::Autoload