aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2009-12-03 09:06:01 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2009-12-03 09:06:01 -0800
commit96e0638ce2a287eb5c43266fb4eb3e656e9968cf (patch)
tree71dea7fc5d718108b96fc6af7ce4d430ebb5a453 /activesupport
parentc1304098cca8a9247a9ad1461a1a343354650843 (diff)
downloadrails-96e0638ce2a287eb5c43266fb4eb3e656e9968cf.tar.gz
rails-96e0638ce2a287eb5c43266fb4eb3e656e9968cf.tar.bz2
rails-96e0638ce2a287eb5c43266fb4eb3e656e9968cf.zip
Should fix a few Sam Ruby fails.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support.rb33
-rw-r--r--activesupport/lib/active_support/autoload.rb31
2 files changed, 32 insertions, 32 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 0478ae4ebc..9e21b3faf3 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -34,7 +34,38 @@ module ActiveSupport
end
end
-require 'active_support/autoload'
+require "active_support/dependencies/autoload"
+
+module ActiveSupport
+ extend ActiveSupport::Autoload
+
+ autoload :BacktraceCleaner
+ autoload :Base64
+ autoload :BasicObject
+ autoload :Benchmarkable
+ autoload :BufferedLogger
+ autoload :Cache
+ autoload :Callbacks
+ autoload :Concern
+ autoload :Configurable
+ autoload :DeprecatedCallbacks
+ autoload :Deprecation
+ autoload :Gzip
+ autoload :Inflector
+ autoload :Memoizable
+ autoload :MessageEncryptor
+ autoload :MessageVerifier
+ autoload :Multibyte
+ autoload :OptionMerger
+ autoload :OrderedHash
+ autoload :OrderedOptions
+ autoload :Notifications
+ autoload :Rescuable
+ autoload :SecureRandom
+ autoload :StringInquirer
+ autoload :XmlMini
+end
+
require 'active_support/vendor'
require 'i18n'
diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
deleted file mode 100644
index e57cf24b25..0000000000
--- a/activesupport/lib/active_support/autoload.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require "active_support/dependencies/autoload"
-
-module ActiveSupport
- extend ActiveSupport::Autoload
-
- autoload :BacktraceCleaner
- autoload :Base64
- autoload :BasicObject
- autoload :Benchmarkable
- autoload :BufferedLogger
- autoload :Cache
- autoload :Callbacks
- autoload :Concern
- autoload :Configurable
- autoload :DeprecatedCallbacks
- autoload :Deprecation
- autoload :Gzip
- autoload :Inflector
- autoload :Memoizable
- autoload :MessageEncryptor
- autoload :MessageVerifier
- autoload :Multibyte
- autoload :OptionMerger
- autoload :OrderedHash
- autoload :OrderedOptions
- autoload :Notifications
- autoload :Rescuable
- autoload :SecureRandom
- autoload :StringInquirer
- autoload :XmlMini
-end