diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 50ed73a430e75600d4ac0ac04f33cacbc5eb2d65..12aa4f0fe52201ae2cd6bb10bb3240f2e4b2ba6f 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 0bc0ecbbe99dd9172ab7e8fae13d629766e0a23e..cc81970ddce0af7da2e2c3d45359b2ff9582dc9c 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 857780c80b7c2508c8e30554e3ea253cb2e8978b..d6e701dc4155e28f82ba7d9f02481a200264b7b3 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'