diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-19 16:10:24 +0200 |
| commit | 8037fee9ff1dd13c421e6689229457c1ef084074 (patch) | |
| tree | c60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /activesupport/lib/active_support/json/encoding.rb | |
| parent | 908b5305d4446433433313e315deb4083c58233e (diff) | |
| parent | 9f7eaea201b2f408d9effbf82f2731957e284adf (diff) | |
| download | rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2 rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 907094a747..068b58b997 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -4,6 +4,11 @@ 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 require 'json' |