From 6440efa9ea05cde1f001098aa25bebbb2ea20fbb Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 4 Sep 2023 16:35:22 +0900
Subject: [PATCH] Lock globalid gem version to address broken CI

Broken CI is due to https://github.com/rails/globalid/pull/163 in
globalid 1.2.0.

https://buildkite.com/rails/rails/builds/99329#018a5f01-a966-4424-9596-0a7f1deeb1ff/1178-1190
---
 Gemfile      | 3 +++
 Gemfile.lock | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 520fc32d27..2c430d3490 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,6 +45,9 @@ gem "json", ">= 2.0.0"
 # Workaround until Ruby ships with cgi version 0.3.6 or higher.
 gem "cgi", ">= 0.3.6", require: false
 
+# Workaround until globalid gem is fixed
+gem "globalid", "< 1.2.0", require: false
+
 group :rubocop do
   gem "rubocop", ">= 1.25.1", require: false
   gem "rubocop-minitest", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index bc4fff7674..1ce5ac7e03 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -238,7 +238,7 @@ GEM
     fugit (1.8.0)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     google-apis-core (0.9.4)
       addressable (~> 2.5, >= 2.5.1)
@@ -582,6 +582,7 @@ DEPENDENCIES
   delayed_job
   delayed_job_active_record
   error_highlight (>= 0.4.0)
+  globalid (< 1.2.0)
   google-cloud-storage (~> 1.11)
   image_processing (~> 1.2)
   importmap-rails