Skip to content

A platform for community discussion. Free, open, simple.

DEV: Update multi_json to 1.20.1 (#39627)

Jarek Radosz6a2d417b6792
diff --git a/Gemfile.lock b/Gemfile.lock
index 21ed59f4ad4..9406be724ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -318,7 +318,7 @@ GEM
mocha (3.1.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.8.0)
- multi_json (1.19.1)
+ multi_json (1.20.1)
multi_xml (0.8.1)
bigdecimal (>= 3.1, < 5)
multipart-post (2.4.1)
@@ -1088,7 +1088,7 @@ CHECKSUMS
minitest (6.0.5) sha256=f007d7246bf4feea549502842cd7c6aba8851cdc9c90ba06de9c476c0d01155c
mocha (3.1.0) sha256=75f42d69ebfb1f10b32489dff8f8431d37a418120ecdfc07afe3bc183d4e1d56
msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732
- multi_json (1.19.1) sha256=7aefeff8f2c854bf739931a238e4aea64592845e0c0395c8a7d2eea7fdd631b7
+ multi_json (1.20.1) sha256=2f3934e805cc45ef91b551a1f89d0e9191abd06a5e04a2ef09a6a036c452ca6d
multi_xml (0.8.1) sha256=addba0290bac34e9088bfe73dc4878530297a82a7bbd66cb44dcd0a4b86edf5a
multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8
mustache (1.1.2) sha256=d420243400354da78ded2d81541b381ad8d94e8e9b95022d0d71d66f8ef36c00
diff --git a/config/initializers/100-oj.rb b/config/initializers/100-oj.rb
index 57991081c22..29891877bb5 100644
--- a/config/initializers/100-oj.rb
+++ b/config/initializers/100-oj.rb
@@ -4,6 +4,3 @@ Oj::Rails.set_encoder()
Oj::Rails.set_decoder()
Oj::Rails.optimize()
Oj.default_options = Oj.default_options.merge(mode: :compat)
-
-# Not sure why it's not using this by default!
-MultiJson.engine = :oj