diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-31 10:14:15 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-31 10:14:15 -0700 |
commit | ae221d4ef96a701b00fda25ed8e6ea83bce4f645 (patch) | |
tree | 2ca2fd2e6c78d55645c8e63720608d14e10d8712 /activesupport/lib/active_support/core_ext/object/json.rb | |
parent | 1428131f647c1448d897d18eeb9656ea4773838f (diff) | |
parent | e3d775f00a9cbe28e1647b39ed0fb41d5168c5e1 (diff) | |
download | rails-ae221d4ef96a701b00fda25ed8e6ea83bce4f645.tar.gz rails-ae221d4ef96a701b00fda25ed8e6ea83bce4f645.tar.bz2 rails-ae221d4ef96a701b00fda25ed8e6ea83bce4f645.zip |
Merge pull request #12712 from robin850/fix-build
Require time before monkey-patching it
Diffstat (limited to 'activesupport/lib/active_support/core_ext/object/json.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/json.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb index 8586d7eb16..554da1a2aa 100644 --- a/activesupport/lib/active_support/core_ext/object/json.rb +++ b/activesupport/lib/active_support/core_ext/object/json.rb @@ -1,6 +1,7 @@ # Hack to load json gem first so we can overwrite its to_json. require 'json' require 'bigdecimal' +require 'time' # The JSON gem adds a few modules to Ruby core classes containing :to_json definition, overwriting # their default behavior. That said, we need to define the basic to_json method in all of them, |