From 868d4c24a9b3ea474be8277c062362cdf47e22bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 03:39:38 +0000 Subject: [PATCH 1/2] Bump the bundler group with 8 updates Bumps the bundler group with 8 updates: | Package | From | To | | --- | --- | --- | | [laa_crime_forms_common](https://github.com/ministryofjustice/laa-crime-forms-common) | ``75a3590`` | ``04cfd9a`` | | [pg](https://github.com/ged/ruby-pg) | `1.5.8` | `1.5.9` | | [rails](https://github.com/rails/rails) | `7.1.4.1` | `7.1.4.2` | | [sidekiq](https://github.com/sidekiq/sidekiq) | `7.3.2` | `7.3.4` | | [pagy](https://github.com/ddnexus/pagy) | `9.1.0` | `9.1.1` | | [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) | `6.4.3` | `6.4.4` | | [rubocop-rails](https://github.com/rubocop/rubocop-rails) | `2.26.2` | `2.27.0` | | [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) | `3.1.0` | `3.2.0` | Updates `laa_crime_forms_common` from `75a3590` to `04cfd9a` - [Commits](https://github.com/ministryofjustice/laa-crime-forms-common/compare/75a3590610ede1249f0eb7936dcaf0257f8516c4...04cfd9a1386c087436dd2c89836d7d427fc663be) Updates `pg` from 1.5.8 to 1.5.9 - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](https://github.com/ged/ruby-pg/compare/v1.5.8...v1.5.9) Updates `rails` from 7.1.4.1 to 7.1.4.2 - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v7.1.4.1...v7.1.4.2) Updates `sidekiq` from 7.3.2 to 7.3.4 - [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/sidekiq/sidekiq/commits) Updates `pagy` from 9.1.0 to 9.1.1 - [Release notes](https://github.com/ddnexus/pagy/releases) - [Changelog](https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md) - [Commits](https://github.com/ddnexus/pagy/compare/9.1.0...9.1.1) Updates `factory_bot_rails` from 6.4.3 to 6.4.4 - [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases) - [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/main/NEWS.md) - [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.4.3...v6.4.4) Updates `rubocop-rails` from 2.26.2 to 2.27.0 - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.26.2...v2.27.0) Updates `rubocop-rspec` from 3.1.0 to 3.2.0 - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: laa_crime_forms_common dependency-type: direct:production dependency-group: bundler - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch dependency-group: bundler - dependency-name: rails dependency-type: direct:production update-type: version-update:semver-patch dependency-group: bundler - dependency-name: sidekiq dependency-type: direct:production update-type: version-update:semver-patch dependency-group: bundler - dependency-name: pagy dependency-type: direct:production update-type: version-update:semver-patch dependency-group: bundler - dependency-name: factory_bot_rails dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bundler - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler - dependency-name: rubocop-rspec dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bundler ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 139 +++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 70 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 580723ac6..fed003648 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/ministryofjustice/laa-crime-forms-common.git - revision: 75a3590610ede1249f0eb7936dcaf0257f8516c4 + revision: 04cfd9a1386c087436dd2c89836d7d427fc663be specs: laa_crime_forms_common (0.2.7) i18n (>= 1.8.11, < 2) @@ -9,35 +9,35 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.4.1) - actionpack (= 7.1.4.1) - activesupport (= 7.1.4.1) + actioncable (7.1.4.2) + actionpack (= 7.1.4.2) + activesupport (= 7.1.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.4.1) - actionpack (= 7.1.4.1) - activejob (= 7.1.4.1) - activerecord (= 7.1.4.1) - activestorage (= 7.1.4.1) - activesupport (= 7.1.4.1) + actionmailbox (7.1.4.2) + actionpack (= 7.1.4.2) + activejob (= 7.1.4.2) + activerecord (= 7.1.4.2) + activestorage (= 7.1.4.2) + activesupport (= 7.1.4.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.4.1) - actionpack (= 7.1.4.1) - actionview (= 7.1.4.1) - activejob (= 7.1.4.1) - activesupport (= 7.1.4.1) + actionmailer (7.1.4.2) + actionpack (= 7.1.4.2) + actionview (= 7.1.4.2) + activejob (= 7.1.4.2) + activesupport (= 7.1.4.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.4.1) - actionview (= 7.1.4.1) - activesupport (= 7.1.4.1) + actionpack (7.1.4.2) + actionview (= 7.1.4.2) + activesupport (= 7.1.4.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -45,38 +45,38 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.4.1) - actionpack (= 7.1.4.1) - activerecord (= 7.1.4.1) - activestorage (= 7.1.4.1) - activesupport (= 7.1.4.1) + actiontext (7.1.4.2) + actionpack (= 7.1.4.2) + activerecord (= 7.1.4.2) + activestorage (= 7.1.4.2) + activesupport (= 7.1.4.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.4.1) - activesupport (= 7.1.4.1) + actionview (7.1.4.2) + activesupport (= 7.1.4.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.4.1) - activesupport (= 7.1.4.1) + activejob (7.1.4.2) + activesupport (= 7.1.4.2) globalid (>= 0.3.6) - activemodel (7.1.4.1) - activesupport (= 7.1.4.1) - activerecord (7.1.4.1) - activemodel (= 7.1.4.1) - activesupport (= 7.1.4.1) + activemodel (7.1.4.2) + activesupport (= 7.1.4.2) + activerecord (7.1.4.2) + activemodel (= 7.1.4.2) + activesupport (= 7.1.4.2) timeout (>= 0.4.0) activerecord-postgis-adapter (9.0.2) activerecord (~> 7.1.0) rgeo-activerecord (~> 7.0.0) - activestorage (7.1.4.1) - actionpack (= 7.1.4.1) - activejob (= 7.1.4.1) - activerecord (= 7.1.4.1) - activesupport (= 7.1.4.1) + activestorage (7.1.4.2) + actionpack (= 7.1.4.2) + activejob (= 7.1.4.2) + activerecord (= 7.1.4.2) + activesupport (= 7.1.4.2) marcel (~> 1.0) - activesupport (7.1.4.1) + activesupport (7.1.4.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -192,10 +192,10 @@ GEM erubi (1.13.0) et-orbi (1.2.11) tzinfo - factory_bot (6.4.5) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) faker (3.5.1) i18n (>= 1.8.11, < 2) @@ -246,7 +246,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.3.1) railties (>= 6.0.0) - json (2.7.2) + json (2.7.4) json-jwt (1.16.6) activesupport (>= 4.2) aes_key_wrap @@ -272,7 +272,7 @@ GEM logstasher (2.1.5) activesupport (>= 5.2) request_store - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -291,7 +291,7 @@ GEM mutex_m (0.2.0) net-http (0.4.1) uri - net-imap (0.4.17) + net-imap (0.5.0) date net-protocol net-pop (0.1.2) @@ -300,7 +300,7 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) nokogiri (1.16.7-x86_64-darwin) @@ -346,14 +346,14 @@ GEM childprocess (>= 0.6.3, < 6) iniparse (~> 1.4) rexml (~> 3.2) - pagy (9.1.0) + pagy (9.1.1) parallel (1.26.3) parser (3.3.5.0) ast (~> 2.4.1) racc patience_diff (1.2.0) optimist (~> 3.0) - pg (1.5.8) + pg (1.5.9) prometheus_exporter (2.1.1) webrick propshaft (1.1.0) @@ -388,23 +388,23 @@ GEM rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.0) + rackup (1.0.1) rack (< 3) webrick - rails (7.1.4.1) - actioncable (= 7.1.4.1) - actionmailbox (= 7.1.4.1) - actionmailer (= 7.1.4.1) - actionpack (= 7.1.4.1) - actiontext (= 7.1.4.1) - actionview (= 7.1.4.1) - activejob (= 7.1.4.1) - activemodel (= 7.1.4.1) - activerecord (= 7.1.4.1) - activestorage (= 7.1.4.1) - activesupport (= 7.1.4.1) + rails (7.1.4.2) + actioncable (= 7.1.4.2) + actionmailbox (= 7.1.4.2) + actionmailer (= 7.1.4.2) + actionpack (= 7.1.4.2) + actiontext (= 7.1.4.2) + actionview (= 7.1.4.2) + activejob (= 7.1.4.2) + activemodel (= 7.1.4.2) + activerecord (= 7.1.4.2) + activestorage (= 7.1.4.2) + activesupport (= 7.1.4.2) bundler (>= 1.15.0) - railties (= 7.1.4.1) + railties (= 7.1.4.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -416,9 +416,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.4.1) - actionpack (= 7.1.4.1) - activesupport (= 7.1.4.1) + railties (7.1.4.2) + actionpack (= 7.1.4.2) + activesupport (= 7.1.4.2) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -481,17 +481,17 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.33.0) parser (>= 3.3.1.0) rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.26.2) + rubocop-rails (2.27.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.1.0) + rubocop-rspec (3.2.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) rubyzip (2.3.2) @@ -507,8 +507,7 @@ GEM sentry-ruby (5.21.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sidekiq (7.3.2) - concurrent-ruby (< 2) + sidekiq (7.3.4) connection_pool (>= 2.3.0) logger rack (>= 2.2.4) @@ -591,7 +590,7 @@ GEM zeitwerk (>= 2.6) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.0) + zeitwerk (2.7.1) PLATFORMS arm64-darwin-23 From eb24fbaab395a2a3216d8d0ec829bb7be3fbe7c1 Mon Sep 17 00:00:00 2001 From: Patrick Gleeson Date: Wed, 30 Oct 2024 15:11:29 +0000 Subject: [PATCH 2/2] Decrement rackup, which plays badly with puma --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index fed003648..782794cba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,7 +388,7 @@ GEM rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.1) + rackup (1.0.0) rack (< 3) webrick rails (7.1.4.2)