Permalink
Browse files

Merge pull request #12712 from robin850/fix-build

Require time before monkey-patching it
  • Loading branch information...
2 parents 1428131 + e3d775f commit ae221d4ef96a701b00fda25ed8e6ea83bce4f645 @tenderlove tenderlove committed Oct 31, 2013
@@ -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,
@@ -7,7 +7,6 @@
require 'active_support/core_ext/hash/except'
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'

0 comments on commit ae221d4

Please sign in to comment.