From 28c43be251a03bb92fe34b3286b0794a63c74a5a Mon Sep 17 00:00:00 2001
From: johnnyshields <27655+johnnyshields@users.noreply.github.com>
Date: Tue, 6 May 2025 05:11:39 +0900
Subject: [PATCH] Merge changes from 9.0-stable into master

---
 gemfiles/rails-6.1.gemfile   | 3 +++
 lib/mongoid/version.rb       | 2 +-
 spec/integration/app_spec.rb | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile
index 8e5a896766..47f287fdbc 100644
--- a/gemfiles/rails-6.1.gemfile
+++ b/gemfiles/rails-6.1.gemfile
@@ -1,6 +1,9 @@
 # rubocop:todo all
 source 'https://rubygems.org'
 
+# See https://stackoverflow.com/questions/79360526
+gem 'concurrent-ruby', '< 1.3.5'
+
 gem 'actionpack', '~> 6.1'
 gem 'activemodel', '~> 6.1'
 
diff --git a/lib/mongoid/version.rb b/lib/mongoid/version.rb
index f7cad2fb03..b88ed09bd4 100644
--- a/lib/mongoid/version.rb
+++ b/lib/mongoid/version.rb
@@ -2,5 +2,5 @@
 # rubocop:todo all
 
 module Mongoid
-  VERSION = "9.0.2"
+  VERSION = "9.0.6"
 end
diff --git a/spec/integration/app_spec.rb b/spec/integration/app_spec.rb
index 8fdc67987e..4112115fa5 100644
--- a/spec/integration/app_spec.rb
+++ b/spec/integration/app_spec.rb
@@ -26,6 +26,10 @@ def insert_rails_gem_version(cmd)
       skip 'Set APP_TESTS=1 in environment to run application tests'
     end
 
+    if SpecConfig.instance.rails_version < '7.1'
+      skip 'App tests require Rails > 7.0 (see https://stackoverflow.com/questions/79360526)'
+    end
+
     require 'fileutils'
     require 'mrss/child_process_helper'
     require 'open-uri'