diff options
author | Pan Thomakos <pan.thomakos@gmail.com> | 2012-03-18 11:24:04 -0700 |
---|---|---|
committer | Pan Thomakos <pan.thomakos@gmail.com> | 2012-03-18 11:24:04 -0700 |
commit | 0f8f99b989be949708331b81489053c94bd0d953 (patch) | |
tree | 8e78652d7943f41edfd11427df8fed87415e89b5 /activesupport/lib | |
parent | d3bbb23b2fdc6f597410e83e604d4919174aaa27 (diff) | |
download | rails-0f8f99b989be949708331b81489053c94bd0d953.tar.gz rails-0f8f99b989be949708331b81489053c94bd0d953.tar.bz2 rails-0f8f99b989be949708331b81489053c94bd0d953.zip |
Removed ActiveSupport#load_all!
This is no longer used and actually raises an error when trying to load
`ActiveSupport::Dependencies`. I removed the related code and added the
`Dependencies` module to the autoload list.
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support.rb | 15 | ||||
-rw-r--r-- | activesupport/lib/active_support/time.rb | 4 |
2 files changed, 1 insertions, 18 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index dbf0c25c5c..8f018dcbc6 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -22,20 +22,6 @@ #++ require 'securerandom' - -module ActiveSupport - class << self - attr_accessor :load_all_hooks - def on_load_all(&hook) load_all_hooks << hook end - def load_all!; load_all_hooks.each { |hook| hook.call } end - end - self.load_all_hooks = [] - - on_load_all do - [Dependencies, Deprecation, Gzip, MessageVerifier, Multibyte] - end -end - require "active_support/dependencies/autoload" require "active_support/version" require "active_support/logger" @@ -44,6 +30,7 @@ module ActiveSupport extend ActiveSupport::Autoload autoload :Concern + autoload :Dependencies autoload :DescendantsTracker autoload :FileUpdateChecker autoload :LogSubscriber diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb index 9634b52ecf..bcd5d78b54 100644 --- a/activesupport/lib/active_support/time.rb +++ b/activesupport/lib/active_support/time.rb @@ -4,10 +4,6 @@ module ActiveSupport autoload :Duration, 'active_support/duration' autoload :TimeWithZone, 'active_support/time_with_zone' autoload :TimeZone, 'active_support/values/time_zone' - - on_load_all do - [Duration, TimeWithZone, TimeZone] - end end require 'date' |