From a689e7334be9ad94bc630517d3d89b7bfe823068 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 7 Aug 2022 22:47:08 -0700
Subject: [PATCH] Bump Oj to v3.13.20 to fix illegal instruction errors
v3.13.19 was not enough to fix x86 compatability on older processors
because some SSE instructions were used by the compiler in other parts
of the code base. https://github.com/ohler55/oj/pull/806 disables SSE
4.2 optimizations by default.
Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/368656
Changelog: fixed
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index a1482718f9243..ae8c07dbdb8dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -536,7 +536,7 @@ gem 'valid_email', '~> 0.1'
# JSON
gem 'json', '~> 2.5.1'
gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.13.19'
+gem 'oj', '~> 3.13.20'
gem 'multi_json', '~> 1.14.1'
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a630a545a38c..366dc9d624adc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -879,7 +879,7 @@ GEM
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
- oj (3.13.19)
+ oj (3.13.20)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
@@ -1646,7 +1646,7 @@ DEPENDENCIES
oauth2 (~> 2.0)
octokit (~> 4.15)
ohai (~> 16.10)
- oj (~> 3.13.19)
+ oj (~> 3.13.20)
omniauth (~> 1.8)
omniauth-alicloud (~> 1.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)
--
GitLab