From 9f9f2751d9c33c643f224ff2babbed3f4c7d9bef Mon Sep 17 00:00:00 2001 From: Fab Date: Sun, 19 Jan 2025 19:38:13 +0100 Subject: [PATCH 1/2] Restore Puma version pin The issue with capybara that originally caused the change to the main branch of the puma repo has been fixed and solidus should return on the Puma release cycle. (cherry picked from commit 250a9217496b35f79ba58e6654c1f3475d0eb094) --- Gemfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 7f69dd3a643..7ed7135abd0 100644 --- a/Gemfile +++ b/Gemfile @@ -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 From f9f4f2475633fc1f6e7c9cc685bc0ee09403da3a Mon Sep 17 00:00:00 2001 From: Fab Date: Sun, 19 Jan 2025 22:12:12 +0100 Subject: [PATCH 2/2] Fix "temporary" pinning of sqlite as ActiveStorage now supports more recent versions Not required anymore. https://github.com/solidusio/solidus/pull/5727 (cherry picked from commit ad924fd72ed09f69f49400277f4df45ace81b20f) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 7ed7135abd0..9a535a65974 100644 --- a/Gemfile +++ b/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', '~> 1.4', 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