diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-22 06:54:32 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-22 06:54:32 -0700 |
| commit | 6b9f077c85e375bc8089fdc14be6574b9236d7ee (patch) | |
| tree | 4b0b57c0fd78f5a48a804ac285789532280f7e19 | |
| parent | f909e146e41f1eb4e465f17491c7126af8c83845 (diff) | |
| parent | a807db9d198f533cbb1a6bac27c3c211f4729cd8 (diff) | |
| download | rails-6b9f077c85e375bc8089fdc14be6574b9236d7ee.tar.gz rails-6b9f077c85e375bc8089fdc14be6574b9236d7ee.tar.bz2 rails-6b9f077c85e375bc8089fdc14be6574b9236d7ee.zip | |
Merge pull request #6439 from janx/remove_useless_require
refactor lazy_load_hooks load position, fix #6435
| -rw-r--r-- | activesupport/lib/active_support.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 8f018dcbc6..56d6676961 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -25,6 +25,7 @@ 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 188653bd9b..27234d89e1 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,6 +1,5 @@ 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 |