diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-27 14:58:51 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-27 15:00:56 +0200 |
| commit | 0a8aec2c97ab93721d5671555f22975da0a20422 (patch) | |
| tree | 4380b135417842444993dd8ebac5c9c28947dc0b /activerecord/lib/active_record/railtie.rb | |
| parent | a6e47b2811508f6d6b49846c473f6fe86ef9bf9c (diff) | |
| download | rails-0a8aec2c97ab93721d5671555f22975da0a20422.tar.gz rails-0a8aec2c97ab93721d5671555f22975da0a20422.tar.bz2 rails-0a8aec2c97ab93721d5671555f22975da0a20422.zip | |
Revert "Merge pull request #5995 from kennyj/fix_5847-3"
Active Record should be lazy loaded and this pull request
forced Active Record to always be loaded after initialization.
This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing
changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2.
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index db0102700b..eb2769f1ef 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -128,10 +128,5 @@ module ActiveRecord end end - - config.after_initialize do - # We should load ActiveRecord::Base class before loading an application model. - require "active_record/base" - end end end |