Skip to content
This repository
Browse code

Merge pull request #12710 from robin850/fix-build

Require bigdecimal before monkey-patching it
  • Loading branch information...
commit 7c537110d6148dfca22fc24b8d582a37ed66a056 2 parents 6e5d409 + 9d6d07d
Xavier Noria authored October 31, 2013
1  activesupport/lib/active_support/core_ext/object/json.rb
... ...
@@ -1,5 +1,6 @@
1 1
 # Hack to load json gem first so we can overwrite its to_json.
2 2
 require 'json'
  3
+require 'bigdecimal'
3 4
 
4 5
 # The JSON gem adds a few modules to Ruby core classes containing :to_json definition, overwriting
5 6
 # their default behavior. That said, we need to define the basic to_json method in all of them,
1  activesupport/lib/active_support/json/encoding.rb
@@ -3,7 +3,6 @@
3 3
 require 'active_support/core_ext/object/json'
4 4
 require 'active_support/core_ext/module/delegation'
5 5
 
6  
-require 'bigdecimal'
7 6
 require 'active_support/core_ext/big_decimal/conversions' # for #to_s
8 7
 require 'active_support/core_ext/hash/except'
9 8
 require 'active_support/core_ext/hash/slice'

0 notes on commit 7c53711

Please sign in to comment.
Something went wrong with that request. Please try again.