From 47396a9db8e632a5a570dc776e01368c5913097a Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Thu, 2 Aug 2012 18:49:38 +0200 Subject: [PATCH] load active_support/dependencies/autoload in active_support/rails --- actionpack/lib/abstract_controller.rb | 1 - actionpack/lib/action_dispatch.rb | 1 - activesupport/lib/active_support/rails.rb | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 50ed73a430..12aa4f0fe5 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -1,7 +1,6 @@ require 'action_pack' require 'active_support/rails' require 'active_support/concern' -require 'active_support/dependencies/autoload' require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/delegation' diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 0bc0ecbbe9..cc81970ddc 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -23,7 +23,6 @@ require 'active_support' require 'active_support/rails' -require 'active_support/dependencies/autoload' require 'active_support/core_ext/module/attribute_accessors' require 'action_pack' diff --git a/activesupport/lib/active_support/rails.rb b/activesupport/lib/active_support/rails.rb index 857780c80b..d6e701dc41 100644 --- a/activesupport/lib/active_support/rails.rb +++ b/activesupport/lib/active_support/rails.rb @@ -13,3 +13,6 @@ # in? require 'active_support/core_ext/object/inclusion' + +# Rails own autoload, eager_load, etc. +require 'active_support/dependencies/autoload' -- GitLab