2 files changed, 26 insertions, 24 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index a1a140bc33..a20635ba62 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -32,32 +32,9 @@ module ActiveSupport
   on_load_all do
     [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte, SecureRandom]
   end
-
-  autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
-  autoload :Base64, 'active_support/base64'
-  autoload :BasicObject, 'active_support/basic_object'
-  autoload :BufferedLogger, 'active_support/buffered_logger'
-  autoload :Cache, 'active_support/cache'
-  autoload :Callbacks, 'active_support/callbacks'
-  autoload :NewCallbacks, 'active_support/new_callbacks'
-  autoload :ConcurrentHash, 'active_support/concurrent_hash'
-  autoload :DependencyModule, 'active_support/dependency_module'
-  autoload :Deprecation, 'active_support/deprecation'
-  autoload :Gzip, 'active_support/gzip'
-  autoload :Inflector, 'active_support/inflector'
-  autoload :Memoizable, 'active_support/memoizable'
-  autoload :MessageEncryptor, 'active_support/message_encryptor'
-  autoload :MessageVerifier, 'active_support/message_verifier'
-  autoload :Multibyte, 'active_support/multibyte'
-  autoload :OptionMerger, 'active_support/option_merger'
-  autoload :OrderedHash, 'active_support/ordered_hash'
-  autoload :OrderedOptions, 'active_support/ordered_options'
-  autoload :Rescuable, 'active_support/rescuable'
-  autoload :SecureRandom, 'active_support/secure_random'
-  autoload :StringInquirer, 'active_support/string_inquirer'
-  autoload :XmlMini, 'active_support/xml_mini'
 end
 
+require 'active_support/autoload'
 require 'active_support/vendor'
 
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
new file mode 100644
index 0000000000..ed229d1c5f
--- /dev/null
+++ b/activesupport/lib/active_support/autoload.rb
@@ -0,0 +1,25 @@
+module ActiveSupport
+  autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
+  autoload :Base64, 'active_support/base64'
+  autoload :BasicObject, 'active_support/basic_object'
+  autoload :BufferedLogger, 'active_support/buffered_logger'
+  autoload :Cache, 'active_support/cache'
+  autoload :Callbacks, 'active_support/callbacks'
+  autoload :NewCallbacks, 'active_support/new_callbacks'
+  autoload :ConcurrentHash, 'active_support/concurrent_hash'
+  autoload :DependencyModule, 'active_support/dependency_module'
+  autoload :Deprecation, 'active_support/deprecation'
+  autoload :Gzip, 'active_support/gzip'
+  autoload :Inflector, 'active_support/inflector'
+  autoload :Memoizable, 'active_support/memoizable'
+  autoload :MessageEncryptor, 'active_support/message_encryptor'
+  autoload :MessageVerifier, 'active_support/message_verifier'
+  autoload :Multibyte, 'active_support/multibyte'
+  autoload :OptionMerger, 'active_support/option_merger'
+  autoload :OrderedHash, 'active_support/ordered_hash'
+  autoload :OrderedOptions, 'active_support/ordered_options'
+  autoload :Rescuable, 'active_support/rescuable'
+  autoload :SecureRandom, 'active_support/secure_random'
+  autoload :StringInquirer, 'active_support/string_inquirer'
+  autoload :XmlMini, 'active_support/xml_mini'
+end