diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:10:49 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:10:49 -0700 |
commit | ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9 (patch) | |
tree | 94080b82630ad3312e9f29b8ce687f1d6272af34 /activesupport/lib/active_support | |
parent | 42a06d2d6253eed3b9f4fb4edfa251c9508a2e20 (diff) | |
download | rails-ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9.tar.gz rails-ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9.tar.bz2 rails-ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9.zip |
No more free lunch
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/core/all.rb | 1 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/kernel/requires.rb | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core/all.rb b/activesupport/lib/active_support/core/all.rb index f397f48e9c..55e8b4cfac 100644 --- a/activesupport/lib/active_support/core/all.rb +++ b/activesupport/lib/active_support/core/all.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext' require 'active_support/core' Dir["#{File.dirname(__FILE__)}/*.rb"].sort.each do |path| require "active_support/core/#{File.basename(path, '.rb')}" diff --git a/activesupport/lib/active_support/core_ext/kernel/requires.rb b/activesupport/lib/active_support/core_ext/kernel/requires.rb index 323fea49fe..d2238898d6 100644 --- a/activesupport/lib/active_support/core_ext/kernel/requires.rb +++ b/activesupport/lib/active_support/core_ext/kernel/requires.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/kernel/reporting' + module Kernel # Require a library with fallback to RubyGems. Warnings during library # loading are silenced to increase signal/noise for application warnings. @@ -21,4 +23,4 @@ module Kernel end end end -end
\ No newline at end of file +end |