diff options
| author | Michael Koziarski <michael@koziarski.com> | 2012-05-07 18:57:59 -0700 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2012-05-07 18:57:59 -0700 |
| commit | c52ba1b372be08b46fd94deaf1ff382463785c7f (patch) | |
| tree | 49624a5920dd5f11d982d4d062971c7721935648 /activesupport | |
| parent | 4d0e6db9ec7537401d05f523ba8b29955f84f846 (diff) | |
| parent | 0f8f99b989be949708331b81489053c94bd0d953 (diff) | |
| download | rails-c52ba1b372be08b46fd94deaf1ff382463785c7f.tar.gz rails-c52ba1b372be08b46fd94deaf1ff382463785c7f.tar.bz2 rails-c52ba1b372be08b46fd94deaf1ff382463785c7f.zip | |
Merge pull request #5500 from panthomakos/load-all
Removed ActiveSupport#load_all!
Diffstat (limited to 'activesupport')
| -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' |