Browse files

Merge pull request #12710 from robin850/fix-build

Require bigdecimal before monkey-patching it
  • Loading branch information...
2 parents 6e5d409 + 9d6d07d commit 7c537110d6148dfca22fc24b8d582a37ed66a056 @fxn fxn committed Oct 31, 2013
@@ -1,5 +1,6 @@
# Hack to load json gem first so we can overwrite its to_json.
require 'json'
+require 'bigdecimal'
# 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,
@@ -3,7 +3,6 @@
require 'active_support/core_ext/object/json'
require 'active_support/core_ext/module/delegation'
-require 'bigdecimal'
require 'active_support/core_ext/big_decimal/conversions' # for #to_s
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/hash/slice'

0 comments on commit 7c53711

Please sign in to comment.