aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json/encoding.rb
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2013-10-31 11:42:39 +0100
committerRobin Dupret <robin.dupret@gmail.com>2013-10-31 12:19:48 +0100
commit9d6d07ddf46024f3af71c386c69b2af9f70de32a (patch)
tree249620791acec8ca5fea49dbb3fe027816e41e60 /activesupport/lib/active_support/json/encoding.rb
parent6e5d409f659c325871cac4cca79526e815644288 (diff)
downloadrails-9d6d07ddf46024f3af71c386c69b2af9f70de32a.tar.gz
rails-9d6d07ddf46024f3af71c386c69b2af9f70de32a.tar.bz2
rails-9d6d07ddf46024f3af71c386c69b2af9f70de32a.zip
Require bigdecimal before monkey-patching it
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
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb1
1 files changed, 0 insertions, 1 deletions
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'