Permalink
Browse files

Merge pull request #6439 from janx/remove_useless_require

refactor lazy_load_hooks load position, fix #6435
  • Loading branch information...
2 parents f909e14 + a807db9 commit 6b9f077c85e375bc8089fdc14be6574b9236d7ee @josevalim josevalim committed May 22, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −0 activesupport/lib/active_support.rb
  2. +0 −1 activesupport/lib/active_support/i18n.rb
@@ -25,6 +25,7 @@
require "active_support/dependencies/autoload"
require "active_support/version"
require "active_support/logger"
+require "active_support/lazy_load_hooks"
module ActiveSupport
extend ActiveSupport::Autoload
@@ -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

0 comments on commit 6b9f077

Please sign in to comment.