kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Require bigdecimal before monkey-patching it

Browse source 
If we try to monkey-patch the class before requiring it, then a
"superclass mismatch" (TypeError) error is raised and the build can't
run correctly.

Fixes #12708
This commit is contained in:
Robin Dupret 2013-10-31 11:42:39 +01:00
parent 6e5d409f65
commit 9d6d07ddf4
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activesupport/lib/active_support/core_ext/object/json.rb
View file

@ -1,5 +1,6 @@
# Hack to load json gem first so we can overwrite its to_json. # Hack to load json gem first so we can overwrite its to_json.
require 'json' require 'json'
require 'bigdecimal'
# The JSON gem adds a few modules to Ruby core classes containing :to_json definition, overwriting # 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, # 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
View file

@ -3,7 +3,6 @@
require 'active_support/core_ext/object/json' require 'active_support/core_ext/object/json'
require 'active_support/core_ext/module/delegation' 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/big_decimal/conversions' # for #to_s
require 'active_support/core_ext/hash/except' require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/hash/slice' require 'active_support/core_ext/hash/slice'