Merge branch 'main' into 2484-fixed

Author: joelhawksley

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
   test:
     name: test (Rails ${{ matrix.rails_version }}, Ruby ${{ matrix.ruby_version }})
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.ruby_version == 'head' }}
     strategy:
       fail-fast: false
       matrix:

Appraisals

@@ -45,6 +45,8 @@ appraise "rails-8.1" do
 end
 
 appraise "rails-main" do
+  ruby "4.0.0.dev"
+
   gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
   gem "rails", github: "rails/rails", branch: "main"
 

Gemfile

@@ -16,12 +16,12 @@ group :development, :test do
   gem "appraisal-run", "~> 1.1"
   gem "benchmark-ips", "~> 2"
   gem "better_html"
-  gem "bundler", "~> 2"
+  gem "bundler"
   gem "capybara", "~> 3"
   gem "cuprite"
   gem "dry-initializer", require: true
   gem "erb_lint"
-  gem "haml", "~> 6"
+  gem "haml", "~> 7"
   gem "jbuilder", "~> 2"
   gem "m", "~> 1"
   gem "method_source", "~> 1"
@@ -30,6 +30,7 @@ group :development, :test do
   gem "puma", ">= 6"
   gem "rake", "~> 13"
   gem "rails-dom-testing", "~> 2.3.0"
+  gem "reactionview"
   gem "redis"
   gem "rspec-rails"
   gem "rubocop-md", "~> 2"