From 0a8aec2c97ab93721d5671555f22975da0a20422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 27 Apr 2012 14:58:51 +0200 Subject: 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. --- activerecord/lib/active_record/railtie.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'activerecord/lib') 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 -- cgit v1.2.3