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 /activerecord/lib/active_record/railtie.rb | |
| 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.
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 6 |
1 files changed, 4 insertions, 2 deletions
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 |