diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
| commit | 915f108d6a47b9c29e11ebe0b140ef017eb015b0 (patch) | |
| tree | ae0c42330a9fbdc8395f8a5bae4605ef455c18c1 /activesupport | |
| parent | aee63a12f2cfd110725c74686ae1eed58e18fda7 (diff) | |
| parent | b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff) | |
| download | rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.gz rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.bz2 rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 192a82e74f..3c422e0252 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -2,7 +2,12 @@ require 'benchmark' require 'active_support/core_ext/benchmark' require 'active_support/core_ext/exception' require 'active_support/core_ext/class/attribute_accessors' -require 'active_support/core_ext' # FIXME: pulling in all to_param extensions + +%w(hash nil string time date date_time array big_decimal range object boolean).each do |library| + require "active_support/core_ext/#{library}/conversions" +end + +# require 'active_support/core_ext' # FIXME: pulling in all to_param extensions module ActiveSupport # See ActiveSupport::Cache::Store for documentation. |