From 85d77b1098ca4be7b8ee9949e6a88eace16de968 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <code@olegp.name>
Date: Thu, 16 Jan 2025 12:50:26 -0500
Subject: [PATCH] 6.1 and 7.0 are affected only

---
 integration/apps/rails-five/Gemfile  | 10 ----------
 integration/apps/rails-seven/Gemfile |  5 +++--
 integration/apps/rails-six/Gemfile   |  4 ++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/integration/apps/rails-five/Gemfile b/integration/apps/rails-five/Gemfile
index d0a575f3041..246fbd9480f 100644
--- a/integration/apps/rails-five/Gemfile
+++ b/integration/apps/rails-five/Gemfile
@@ -89,13 +89,3 @@ group :test, :development do
 
   gem 'listen'
 end
-
-# concurrent-ruby 1.3.5 removed dependency on logger, see:
-# https://github.com/ruby-concurrency/concurrent-ruby/commit/d7ce956dacd0b772273d39b8ed31a30cff7ecf38
-# Unfortunately this broke Rails because ActiveSupport used Logger
-# before requiring logger.
-# Since the failure happens rather early in rails bootstrapping,
-# patching it is difficult, thus downgrade concurrent-ruby.
-# The issue appears to affect all existing Rails versions:
-# https://github.com/rails/rails/blob/main/activesupport/lib/active_support/logger.rb#L4-L5
-gem 'concurrent-ruby', '1.3.4'
diff --git a/integration/apps/rails-seven/Gemfile b/integration/apps/rails-seven/Gemfile
index c0470e31776..e755c4d87c5 100644
--- a/integration/apps/rails-seven/Gemfile
+++ b/integration/apps/rails-seven/Gemfile
@@ -56,6 +56,7 @@ gem 'mutex_m'
 # before requiring logger.
 # Since the failure happens rather early in rails bootstrapping,
 # patching it is difficult, thus downgrade concurrent-ruby.
-# The issue appears to affect all existing Rails versions:
-# https://github.com/rails/rails/blob/main/activesupport/lib/active_support/logger.rb#L4-L5
+# The issue is fixed in 7-1-stable and should be shipped in the release
+# after 7.1.5.1.
+# See https://github.com/rails/rails/issues/54263
 gem 'concurrent-ruby', '1.3.4'
diff --git a/integration/apps/rails-six/Gemfile b/integration/apps/rails-six/Gemfile
index c80ace0d659..226f27293ec 100644
--- a/integration/apps/rails-six/Gemfile
+++ b/integration/apps/rails-six/Gemfile
@@ -112,6 +112,6 @@ gem 'mutex_m'
 # before requiring logger.
 # Since the failure happens rather early in rails bootstrapping,
 # patching it is difficult, thus downgrade concurrent-ruby.
-# The issue appears to affect all existing Rails versions:
-# https://github.com/rails/rails/blob/main/activesupport/lib/active_support/logger.rb#L4-L5
+# The issue affects Rails 6.1 where apparently it will be never fixed
+# (unlike Rails 7.0 which is fixed in https://github.com/rails/rails/issues/54263).
 gem 'concurrent-ruby', '1.3.4'