diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-22 11:01:16 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-05-22 11:33:03 -0300 |
| commit | 38293ea828ab52043fceecbdc96946b5bc9bb0e5 (patch) | |
| tree | fa70675f6f3d41e23b802e7ea138a56a1372020c | |
| parent | d3ee0a24498b1d54eefbf484720cd63a2b653c65 (diff) | |
| download | rails-38293ea828ab52043fceecbdc96946b5bc9bb0e5.tar.gz rails-38293ea828ab52043fceecbdc96946b5bc9bb0e5.tar.bz2 rails-38293ea828ab52043fceecbdc96946b5bc9bb0e5.zip | |
require active_support/lazy_load_hooks where is needed
| -rw-r--r-- | actionpack/lib/action_view.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 1 |
5 files changed, 4 insertions, 1 deletions
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 |