Merge branch 'multi-json-oj' into 'master'

Default multi_json to Oj See merge request gitlab-org/gitlab!83762

Merge branch 'multi-json-oj' into 'master'
Default multi_json to Oj See merge request gitlab-org/gitlab!83762
6ecd8a55 · Douglas Barbosa Alexandre · ad12708c · 67e8efb3 · 6ecd8a55
Commit 6ecd8a55 authored Mar 28, 2022 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/initializers/multi_json.rb config/initializers/multi_json.rb +1 -1

No files found.
--- a/config/initializers/multi_json.rb
+++ b/config/initializers/multi_json.rb
@@ -2,4 +2,4 @@

 # Explicitly set the JSON adapter used by MultiJson
 # Currently we want this to default to the existing json gem
-MultiJson.use(:json_gem)
+MultiJson.use(:oj)