Merge branch 'main' into njjjr/add-missing-locales

Author: nerijunior

.github/workflows/test_solidus.yml

@@ -38,8 +38,8 @@ jobs:
             database: sqlite
             storage: activestorage
           - rails: "8.1"
-            ruby: "3.4"
-            database: sqlite
+            ruby: "4.0"
+            database: postgres
             storage: activestorage
     env:
       BUNDLE_WITHOUT: "lint release"

Gemfile

@@ -21,6 +21,7 @@ gem 'pg', '~> 1.0', require: false if dbs.match?(/all|postgres/)
 gem 'fast_sqlite', require: false if dbs.match?(/all|sqlite/)
 gem 'sqlite3', '>= 2.1', require: false if dbs.match?(/all|sqlite/)
 
+gem 'benchmark', '~> 0.5', require: false
 gem 'database_cleaner', '~> 2.0', require: false
 gem 'rspec-activemodel-mocks', '~> 1.1', require: false
 gem 'rspec-rails', '~> 6.0.3', require: false
@@ -31,7 +32,7 @@ gem 'rack', '< 3', require: false
 gem 'rake', require: false, groups: [:lint, :release]
 gem 'rails-controller-testing', require: false
 gem 'puma', '< 7', require: false
-gem 'i18n-tasks', '~> 0.9', require: false
+gem 'i18n-tasks', '~> 1.1.0', require: false
 gem 'rspec_junit_formatter', require: false
 gem 'yard', require: false
 gem 'db-query-matchers', require: false

bin/rails-application-template

@@ -18,7 +18,7 @@ if $0 == __FILE__
 end
 
 gem 'solidus'
-gem 'solidus_auth_devise'
+gem 'solidus_auth_devise', github: 'solidusio/solidus_auth_devise', branch: 'main'
 gem 'rails_12factor'
 
 gem_group :heroku do