From 6a5b44be53d075a6e18a63a78282072c8e12ef8d Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 2 Sep 2021 11:01:54 +0800
Subject: [PATCH] DEV: Pin oj gem to 3.13.2. (#14219)

Follow-up to 0183d51070d33abc66c8681b43a5ce7571333b13
---
 Gemfile      | 5 ++++-
 Gemfile.lock | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 48f7879ff69..9c2ff7cdbb6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,10 @@ gem 'omniauth-oauth2', require: false
 
 gem 'omniauth-google-oauth2'
 
-gem 'oj'
+# Pinning oj until https://github.com/ohler55/oj/issues/699 is resolved.
+# Segfaults and stuck processes after upgrading.
+gem 'oj', '3.13.2'
+
 gem 'pg'
 gem 'mini_sql'
 gem 'pry-rails', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 1aed5f27eb6..c882072f0dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -550,7 +550,7 @@ DEPENDENCIES
   multi_json
   mustache
   nokogiri
-  oj
+  oj (= 3.13.2)
   omniauth
   omniauth-facebook
   omniauth-github
@@ -609,4 +609,4 @@ DEPENDENCIES
   yaml-lint
 
 BUNDLED WITH
-   2.2.19
+   2.2.26