diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-01 13:43:53 +0100 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-02 17:50:12 -0800 |
| commit | 36a9644b86c53e322a891669cbdd2cf62cd648ac (patch) | |
| tree | 7885dc5427219a3fe56c6e434b401758786cceca /activesupport/lib/active_support/json/encoding.rb | |
| parent | b540eca5889d7a28fac39c9ec0df715aa89487ce (diff) | |
| download | rails-36a9644b86c53e322a891669cbdd2cf62cd648ac.tar.gz rails-36a9644b86c53e322a891669cbdd2cf62cd648ac.tar.bz2 rails-36a9644b86c53e322a891669cbdd2cf62cd648ac.zip | |
Clarify date/time dependencies
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index f440d6ce58..8e8f9022c1 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -6,10 +6,7 @@ require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/object/instance_variables' require 'active_support/deprecation' -require 'active_support/core_ext/date_time/conversions' -require 'active_support/core_ext/time/conversions' require 'active_support/time_with_zone' -require 'active_support/values/time_zone' # Hack to load json gem first so we can overwrite its to_json. begin |