Merge branch 'main' into allow-rails8

Gemfile

@@ -19,7 +19,7 @@ dbs = ENV['DB_ALL'] ? 'all' : ENV.fetch('DB', 'sqlite')
 gem 'mysql2', '~> 0.5.0', require: false if dbs.match?(/all|mysql/)
 gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
 gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
-gem 'sqlite3', '~> 2.0', require: false if dbs.match?(/all|sqlite/)
+gem 'sqlite3', '>= 2.1', require: false if dbs.match?(/all|sqlite/)
 
 
 gem 'database_cleaner', '~> 2.0', require: false
@@ -31,12 +31,7 @@ gem 'simplecov-cobertura', require: false
 gem 'rack', '< 3', require: false
 gem 'rake', require: false, groups: [:lint, :release]
 gem 'rails-controller-testing', require: false
-
-# Temporarily use the master branch of puma until the next release
-# The current release, 6.4.3, has bug that causes Capybara to crash.
-# See https://github.com/puma/puma/pull/3532
-gem 'puma', github: 'puma/puma', branch: 'master', require: false
-
+gem 'puma', '< 7', require: false
 gem 'i18n-tasks', '~> 0.9', require: false
 gem 'rspec_junit_formatter', require: false
 gem 'yard', require: false