From 50f710bcaefe08f40bbbeb6d5eec12e720f12c8e Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Fri, 30 Jun 2023 01:39:55 +0200
Subject: [PATCH] DEV: Bump oj from 3.13.14 to 3.15.0 (#22352)

https://github.com/ohler55/oj/issues/789 has been fixed and SSE4.2 is disabled by default.
---
 Gemfile      | 3 +--
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5f2b12bf78d..81aaa5a425a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,8 +96,7 @@ gem "omniauth-oauth2", require: false
 
 gem "omniauth-google-oauth2"
 
-# pending: https://github.com/ohler55/oj/issues/789
-gem "oj", "3.13.14"
+gem "oj"
 
 gem "pg"
 gem "mini_sql"
diff --git a/Gemfile.lock b/Gemfile.lock
index 83f004e13b5..cb2c27676c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -277,7 +277,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    oj (3.13.14)
+    oj (3.15.0)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -611,7 +611,7 @@ DEPENDENCIES
   net-pop
   net-smtp
   nokogiri
-  oj (= 3.13.14)
+  oj
   omniauth
   omniauth-facebook
   omniauth-github