From f8db87552f88d78eda2e0dffbd1a0bd8b02ff005 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:50:55 +0000 Subject: [PATCH 1/2] Bump rubocop-govuk from 5.0.7 to 5.0.8 Bumps [rubocop-govuk](https://github.com/alphagov/rubocop-govuk) from 5.0.7 to 5.0.8. - [Changelog](https://github.com/alphagov/rubocop-govuk/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/rubocop-govuk/compare/v5.0.7...v5.0.8) --- updated-dependencies: - dependency-name: rubocop-govuk dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 64d5f95179c..5ee900da6a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -398,7 +398,7 @@ GEM kaminari-core (1.2.2) kramdown (2.5.1) rexml (>= 3.3.9) - language_server-protocol (3.17.0.3) + language_server-protocol (3.17.0.4) launchy (3.1.0) addressable (~> 2.8) childprocess (~> 5.0) @@ -723,7 +723,7 @@ GEM term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc parslet (2.0.0) @@ -848,7 +848,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.2) - rubocop (1.69.2) + rubocop (1.70.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -862,8 +862,8 @@ GEM parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-govuk (5.0.7) - rubocop (= 1.69.2) + rubocop-govuk (5.0.8) + rubocop (= 1.70.0) rubocop-ast (= 1.37.0) rubocop-capybara (= 2.21.0) rubocop-rails (= 2.28.0) From fc66ebc9369af71a33309ba18dda9c1e828e9648 Mon Sep 17 00:00:00 2001 From: ChrisBAshton Date: Tue, 4 Feb 2025 10:39:32 +0000 Subject: [PATCH 2/2] Fix rubocop violations --- app/controllers/admin/fact_check_requests_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/fact_check_requests_controller.rb b/app/controllers/admin/fact_check_requests_controller.rb index 6a8a9922f10..0be7e0c5f63 100644 --- a/app/controllers/admin/fact_check_requests_controller.rb +++ b/app/controllers/admin/fact_check_requests_controller.rb @@ -57,7 +57,7 @@ def enforce_permissions! def mailer_url_options options = { host: request.host } options[:protocol] = request.protocol unless request.protocol == "http://" - options[:port] = request.port unless request.port == 80 || request.port == 443 + options[:port] = request.port unless [80, 443].include?(request.port) options end