aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-03 21:30:33 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-04 14:10:28 -0700
commit5bf3294c8b3aeb3afd426e8c182456c675829c1e (patch)
tree7445fa6fd045d3525241d6f397e178261aaa361f /activesupport/lib/active_support/json
parent8a09ea6d6dbbd6a1325b3be429d96d9c45c046df (diff)
downloadrails-5bf3294c8b3aeb3afd426e8c182456c675829c1e.tar.gz
rails-5bf3294c8b3aeb3afd426e8c182456c675829c1e.tar.bz2
rails-5bf3294c8b3aeb3afd426e8c182456c675829c1e.zip
Move Date#xmlschema to conversions and add a missing require
Diffstat (limited to 'activesupport/lib/active_support/json')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 315897b423..2f9588e0f4 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -11,6 +11,8 @@ require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/object/instance_variables'
require 'time'
require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/date/conversions'
module ActiveSupport
class << self