diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-04 09:29:18 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-04 10:08:06 -0800 |
| commit | 23ad1eff0dab4079b7bc68f71df537fc85582d05 (patch) | |
| tree | 7cd0b735b7f9252c2f1e38498a596acdbf790ee8 | |
| parent | 5c07c33ab4de037aeb1f6cc6817fddd28f9a35d2 (diff) | |
| download | rails-23ad1eff0dab4079b7bc68f71df537fc85582d05.tar.gz rails-23ad1eff0dab4079b7bc68f71df537fc85582d05.tar.bz2 rails-23ad1eff0dab4079b7bc68f71df537fc85582d05.zip | |
Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always uses AS.
| -rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/all.rb | 5 |
4 files changed, 7 insertions, 7 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index 4ed70503fd..b5230f14ed 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -22,4 +22,4 @@ module ActionMailer ActionMailer::Base.send(:include, ActionController::UrlFor) if defined?(ActionController) end end -end
\ No newline at end of file +end diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 9151de4462..55a5c22ac0 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -1,5 +1,6 @@ require "action_controller" require "rails" +require "action_view/railtie" module ActionController class Railtie < Rails::Railtie diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 2b204043b4..e70b0d1bfb 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -1,10 +1,12 @@ +require "active_record" +require "rails" +require "active_model/railtie" + # For now, action_controller must always be present with # rails, so let's make sure that it gets required before # here. This is needed for correctly setting up the middleware. # In the future, this might become an optional require. -require "active_record" require "action_controller/railtie" -require "rails" module ActiveRecord class Railtie < Rails::Railtie diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 1a0b4a8d73..82775b7e3b 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -1,11 +1,8 @@ require "rails" %w( - active_support - active_model active_record action_controller - action_view action_mailer active_resource rails/test_unit @@ -14,4 +11,4 @@ require "rails" require "#{framework}/railtie" rescue LoadError end -end
\ No newline at end of file +end |