From 57e1967893e3b8f5ea9c624ffbd823196bf5a1ff Mon Sep 17 00:00:00 2001 From: mayra lucia navarro Date: Sat, 27 Jan 2024 23:56:39 -0500 Subject: [PATCH 1/5] update gem puma to 6.4.2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d05bf0c..351230a 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'devise', '~>4.9.2' gem 'jbuilder', '~> 2.7' gem 'pg', '~> 1.4.5' -gem 'puma', '~> 5.6' +gem 'puma', '~> 6.4.2' gem 'rails', '~> 7.0.8' # Use Sass to process CSS diff --git a/Gemfile.lock b/Gemfile.lock index 8a60c50..dba49bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,7 +227,7 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (5.0.3) - puma (5.6.8) + puma (6.4.2) nio4r (~> 2.0) pundit (2.3.1) activesupport (>= 3.0.0) @@ -423,7 +423,7 @@ DEPENDENCIES pg (~> 1.4.5) prettier (~> 2.0) pry-rails (~> 0.3.9) - puma (~> 5.6) + puma (~> 6.4.2) pundit (>= 2.3.0) rack-mini-profiler (~> 2.0) rails (~> 7.0.8) From b9bb70eb1b845e6bef702e1cdc0351a2630c23ab Mon Sep 17 00:00:00 2001 From: mayra lucia navarro Date: Sun, 28 Jan 2024 00:10:19 -0500 Subject: [PATCH 2/5] fix shakapacker mismatch version --- Gemfile | 4 ++-- Gemfile.lock | 10 ++++++---- config/shakapacker.yml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 351230a..f9cdeff 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'rails', '~> 7.0.8' # Use Sass to process CSS gem 'sassc-rails', '~> 2.1.2' -gem 'shakapacker', '= 7.1' +gem 'shakapacker', '= 7.2.1' gem 'slack-ruby-client', '~> 2.0.0' gem 'bootsnap', '>= 1.4.4', require: false @@ -81,5 +81,5 @@ gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] # Explicitly depend on and compile nokogiri # so we can run CI on Ruby head -gem 'mutex_m' +gem 'mutex_m', '~> 0.2.0' gem 'nokogiri', '~> 1.14', force_ruby_platform: true diff --git a/Gemfile.lock b/Gemfile.lock index dba49bb..5f1c571 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,6 +214,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) os (1.1.4) + package_json (0.1.0) pagy (6.2.0) parallel (1.23.0) parser (3.2.2.3) @@ -235,7 +236,7 @@ GEM rack (2.2.8) rack-mini-profiler (2.3.4) rack (>= 1.2.0) - rack-proxy (0.7.6) + rack-proxy (0.7.7) rack rack-test (2.1.0) rack (>= 1.3) @@ -334,8 +335,9 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semantic_range (3.0.0) - shakapacker (7.1.0) + shakapacker (7.2.1) activesupport (>= 5.2) + package_json rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) @@ -417,7 +419,7 @@ DEPENDENCIES jsbundling-rails (~> 1.1) jwt (>= 2.6.0) listen (~> 3.3) - mutex_m + mutex_m (~> 0.2.0) nokogiri (~> 1.14) pagy (~> 6.2) pg (~> 1.4.5) @@ -432,7 +434,7 @@ DEPENDENCIES rubocop (~> 1.22) sassc-rails (~> 2.1.2) selenium-webdriver (~> 4.15) - shakapacker (= 7.1) + shakapacker (= 7.2.1) shoulda-matchers (~> 5.3.0) slack-ruby-client (~> 2.0.0) stimulus-rails (~> 1.2.1) diff --git a/config/shakapacker.yml b/config/shakapacker.yml index 686dbbb..bfe8f1e 100644 --- a/config/shakapacker.yml +++ b/config/shakapacker.yml @@ -40,7 +40,7 @@ default: &default webpack_loader: 'babel' # Set to true to enable check for matching versions of shakapacker gem and NPM package - will raise an error if there is a mismatch or wildcard versioning is used - ensure_consistent_versioning: false + ensure_consistent_versioning: true # Select whether the compiler will use SHA digest ('digest' option) or most most recent modified timestamp ('mtime') to determine freshness compiler_strategy: digest From 9f60a394c75baed1207e2471024c5dd25ce02494 Mon Sep 17 00:00:00 2001 From: mayra lucia navarro Date: Sun, 28 Jan 2024 00:21:31 -0500 Subject: [PATCH 3/5] upgrade rspec-rails gem --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f9cdeff..cea8091 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,7 @@ group :development, :test do # Run tests gem 'rails-controller-testing', '~> 1.0.5' - gem 'rspec-rails', '~> 6.0.1' + gem 'rspec-rails', '~> 6.1.1' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 5f1c571..1d1fdae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -297,7 +297,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -430,7 +430,7 @@ DEPENDENCIES rack-mini-profiler (~> 2.0) rails (~> 7.0.8) rails-controller-testing (~> 1.0.5) - rspec-rails (~> 6.0.1) + rspec-rails (~> 6.1.1) rubocop (~> 1.22) sassc-rails (~> 2.1.2) selenium-webdriver (~> 4.15) From 29c583184d5c034bf6d3c7bf8bf5e6135b88df0e Mon Sep 17 00:00:00 2001 From: mayra lucia navarro Date: Sun, 28 Jan 2024 01:09:48 -0500 Subject: [PATCH 4/5] remove latest ruby version for tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c94eef..ddf2e8f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ jobs: test: strategy: matrix: - ruby: ['3.2.2', head] + ruby: ['3.2.2'] runs-on: ubuntu-20.04 services: postgres: From eba10cea6f9b75127e2f42ad7a97f9ee2c5e1e89 Mon Sep 17 00:00:00 2001 From: mayra lucia navarro Date: Sun, 28 Jan 2024 01:12:35 -0500 Subject: [PATCH 5/5] remove mutex_m gem --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index cea8091..1a4ee7f 100644 --- a/Gemfile +++ b/Gemfile @@ -81,5 +81,4 @@ gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] # Explicitly depend on and compile nokogiri # so we can run CI on Ruby head -gem 'mutex_m', '~> 0.2.0' gem 'nokogiri', '~> 1.14', force_ruby_platform: true diff --git a/Gemfile.lock b/Gemfile.lock index 1d1fdae..29cd30d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,7 +198,6 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.3.0) - mutex_m (0.2.0) net-imap (0.4.2) date net-protocol @@ -419,7 +418,6 @@ DEPENDENCIES jsbundling-rails (~> 1.1) jwt (>= 2.6.0) listen (~> 3.3) - mutex_m (~> 0.2.0) nokogiri (~> 1.14) pagy (~> 6.2) pg (~> 1.4.5)