diff options
| author | Xavier Noria <fxn@hashref.com> | 2013-10-31 04:33:04 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2013-10-31 04:33:04 -0700 |
| commit | 7c537110d6148dfca22fc24b8d582a37ed66a056 (patch) | |
| tree | 249620791acec8ca5fea49dbb3fe027816e41e60 | |
| parent | 6e5d409f659c325871cac4cca79526e815644288 (diff) | |
| parent | 9d6d07ddf46024f3af71c386c69b2af9f70de32a (diff) | |
| download | rails-7c537110d6148dfca22fc24b8d582a37ed66a056.tar.gz rails-7c537110d6148dfca22fc24b8d582a37ed66a056.tar.bz2 rails-7c537110d6148dfca22fc24b8d582a37ed66a056.zip | |
Merge pull request #12710 from robin850/fix-build
Require bigdecimal before monkey-patching it
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/json.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb index 1cbc935c30..8586d7eb16 100644 --- a/activesupport/lib/active_support/core_ext/object/json.rb +++ b/activesupport/lib/active_support/core_ext/object/json.rb @@ -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, diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 9a89dac449..5f58068617 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -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' |