From fb25333b7f86cdf8c750ab191c64bcd6c9627b0f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Mon, 31 Jan 2022 23:45:52 +0100
Subject: [PATCH] DEV: Update oj gem (#15713)

https://github.com/ohler55/oj/issues/699 was fixed back in September 2021.
---
 Gemfile      | 4 +---
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9cdfbf21a9d..17f81262cf5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,9 +105,7 @@ gem 'omniauth-oauth2', require: false
 
 gem 'omniauth-google-oauth2'
 
-# Pinning oj until https://github.com/ohler55/oj/issues/699 is resolved.
-# Segfaults and stuck processes after upgrading.
-gem 'oj', '3.13.2'
+gem 'oj'
 
 gem 'pg'
 gem 'mini_sql'
diff --git a/Gemfile.lock b/Gemfile.lock
index 43e91f371db..1ef1259fbc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -265,7 +265,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.13.2)
+    oj (3.13.11)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -558,7 +558,7 @@ DEPENDENCIES
   multi_json
   mustache
   nokogiri
-  oj (= 3.13.2)
+  oj
   omniauth
   omniauth-facebook
   omniauth-github