Skip to content

Commit 2537902

Browse files
authored
Merge pull request rails#49127 from kamipo/lock_globalid
Lock globalid gem version to address broken CI
2 parents f324203 + 6440efa commit 2537902

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ gem "json", ">= 2.0.0"
4545
# Workaround until Ruby ships with cgi version 0.3.6 or higher.
4646
gem "cgi", ">= 0.3.6", require: false
4747

48+
# Workaround until globalid gem is fixed
49+
gem "globalid", "< 1.2.0", require: false
50+
4851
group :rubocop do
4952
gem "rubocop", ">= 1.25.1", require: false
5053
gem "rubocop-minitest", require: false

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ GEM
238238
fugit (1.8.0)
239239
et-orbi (~> 1, >= 1.2.7)
240240
raabro (~> 1.4)
241-
globalid (1.0.0)
241+
globalid (1.1.0)
242242
activesupport (>= 5.0)
243243
google-apis-core (0.9.4)
244244
addressable (~> 2.5, >= 2.5.1)
@@ -582,6 +582,7 @@ DEPENDENCIES
582582
delayed_job
583583
delayed_job_active_record
584584
error_highlight (>= 0.4.0)
585+
globalid (< 1.2.0)
585586
google-cloud-storage (~> 1.11)
586587
image_processing (~> 1.2)
587588
importmap-rails

0 commit comments

Comments
 (0)