Skip to content

Merge changes from 9.0-stable into master (please don't squash commits) #5977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Merge changes from 9.0-stable into master (please don't squash commits) #5977

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28c43be
Merge changes from 9.0-stable into master
johnnyshields May 5, 2025
41de284
Merge branch 'master' into merge-9.0-stable-to-master
johnnyshields Jun 20, 2025
eefa5e4
Merge branch 'master' into merge-9.0-stable-to-master
johnnyshields Sep 8, 2025
cba938c
Update version.rb
johnnyshields Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gemfiles/rails-6.1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.0'
gem 'activemodel', '~> 6.1.0'

Expand Down
2 changes: 1 addition & 1 deletion lib/mongoid/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ module Mongoid
#
# Note that this file is automatically updated via `rake candidate:create`.
# Manual changes to this file will be overwritten by that rake task.
VERSION = '9.0.2'
VERSION = "9.0.6"
end
4 changes: 4 additions & 0 deletions spec/integration/app_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading