From 8159fa7ad4310f49631331a722f0109553b101dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 11:26:52 +0000 Subject: [PATCH 1/2] Bump govuk_app_config from 4.9.0 to 4.10.1 Bumps [govuk_app_config](https://github.com/alphagov/govuk_app_config) from 4.9.0 to 4.10.1. - [Release notes](https://github.com/alphagov/govuk_app_config/releases) - [Changelog](https://github.com/alphagov/govuk_app_config/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_app_config/compare/v4.9.0...v4.10.1) --- updated-dependencies: - dependency-name: govuk_app_config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dd31c3da4..6da479cbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,11 +112,11 @@ GEM rest-client (~> 2.0) globalid (1.0.0) activesupport (>= 5.0) - govuk_app_config (4.9.0) + govuk_app_config (4.10.1) logstasher (~> 2.1) plek (~> 4) prometheus_exporter (~> 2.0) - puma (~> 5.6) + puma (>= 5.6, < 7.0) rack-proxy (~> 0.7) sentry-rails (~> 5.3) sentry-ruby (~> 5.3) @@ -207,7 +207,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.0) - puma (5.6.5) + puma (6.0.0) nio4r (~> 2.0) racc (1.6.0) rack (2.2.4) From 3fe92e856016921d8e7f29a9eaee5e44e072ab49 Mon Sep 17 00:00:00 2001 From: chao-xian Date: Thu, 3 Nov 2022 14:24:14 +0000 Subject: [PATCH 2/2] Make govuk_app_config use Puma 5 The capybara gem is currently not compatible with Puma 6 and thus this gem update can't go ahead. Capybara already has a fix for this which hasn't been released [1] [1]: teamcapybara/capybara#2530 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6da479cbd..f0bb642a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,7 +207,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.0) - puma (6.0.0) + puma (5.6.5) nio4r (~> 2.0) racc (1.6.0) rack (2.2.4)