From 38293ea828ab52043fceecbdc96946b5bc9bb0e5 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 22 May 2012 11:01:16 -0300
Subject: require active_support/lazy_load_hooks where is needed

---
 actionpack/lib/action_view.rb            | 1 +
 activemodel/lib/active_model.rb          | 1 +
 activerecord/lib/active_record.rb        | 1 +
 activesupport/lib/active_support.rb      | 1 -
 activesupport/lib/active_support/i18n.rb | 1 +
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 3823f87027..2408207865 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -22,6 +22,7 @@
 #++
 
 require 'active_support'
+require 'active_support/lazy_load_hooks'
 require 'action_pack'
 
 module ActionView
diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
index ded1b752df..451f3e4742 100644
--- a/activemodel/lib/active_model.rb
+++ b/activemodel/lib/active_model.rb
@@ -22,6 +22,7 @@
 #++
 
 require 'active_support'
+require 'active_support/lazy_load_hooks'
 require 'active_model/version'
 
 module ActiveModel
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 210820062b..2cbe04ee44 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -22,6 +22,7 @@
 #++
 
 require 'active_support'
+require 'active_support/lazy_load_hooks'
 require 'active_model'
 require 'arel'
 require 'active_record_deprecated_finders'
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 56d6676961..8f018dcbc6 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -25,7 +25,6 @@ require 'securerandom'
 require "active_support/dependencies/autoload"
 require "active_support/version"
 require "active_support/logger"
-require "active_support/lazy_load_hooks"
 
 module ActiveSupport
   extend ActiveSupport::Autoload
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb
index 27234d89e1..188653bd9b 100644
--- a/activesupport/lib/active_support/i18n.rb
+++ b/activesupport/lib/active_support/i18n.rb
@@ -1,5 +1,6 @@
 begin
   require 'i18n'
+  require 'active_support/lazy_load_hooks'
 rescue LoadError => e
   $stderr.puts "The i18n gem is not available. Please add it to your Gemfile and run bundle install"
   raise e
-- 
cgit v1.2.3