From 0e64a9ca0fcaa206230172323d963969fe52fed8 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 19:16:09 +0000 Subject: [PATCH 01/10] Update rubocop-performance to version 1.25.0 --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a679778588..4da112b02b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,8 +263,8 @@ GEM bigdecimal (>= 3.0) ostruct (>= 0.2) ostruct (0.6.1) - parallel (1.26.3) - parser (3.3.7.4) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc pp (0.6.2) @@ -365,7 +365,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.2) - rubocop (1.75.1) + rubocop (1.75.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -373,15 +373,15 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.43.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.43.0) + rubocop-ast (1.44.1) parser (>= 3.3.7.2) prism (~> 1.4) - rubocop-performance (1.24.0) + rubocop-performance (1.25.0) lint_roller (~> 1.1) - rubocop (>= 1.72.1, < 2.0) + rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) rubocop-rails (2.30.3) activesupport (>= 4.2.0) From d973fb6a0c64854fba4497e9ddfa2f0d3b50a625 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 19:25:50 +0000 Subject: [PATCH 02/10] Update rubocop-rails to version 2.31.0 --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a679778588..14aaf6a082 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,8 +263,8 @@ GEM bigdecimal (>= 3.0) ostruct (>= 0.2) ostruct (0.6.1) - parallel (1.26.3) - parser (3.3.7.4) + parallel (1.27.0) + parser (3.3.8.0) ast (~> 2.4.1) racc pp (0.6.2) @@ -285,7 +285,7 @@ GEM puma (6.6.0) nio4r (~> 2.0) racc (1.8.1) - rack (3.1.12) + rack (3.1.13) rack-mini-profiler (3.3.1) rack (>= 1.2.0) rack-proxy (0.7.7) @@ -365,7 +365,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.2) - rubocop (1.75.1) + rubocop (1.75.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -373,21 +373,21 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.43.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.43.0) + rubocop-ast (1.44.1) parser (>= 3.3.7.2) prism (~> 1.4) rubocop-performance (1.24.0) lint_roller (~> 1.1) rubocop (>= 1.72.1, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) - rubocop-rails (2.30.3) + rubocop-rails (2.31.0) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.72.1, < 2.0) + rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (1.13.0) ruby-units (4.1.0) From 97405b71f6791ef2ad84699cade86491ef4a66bb Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 19:41:04 +0000 Subject: [PATCH 03/10] Update eslint-plugin-vue to version 9.33.0 --- package.json | 2 +- yarn.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4ef790aef6..807cbcc916 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint": "^8.0.0", "eslint-config-prettier": "^8.10.0", "eslint-plugin-vitest": "^0.5.4", - "eslint-plugin-vue": "^9.32.0", + "eslint-plugin-vue": "^9.33.0", "jsdom": "^24.1.2", "markdown-toc": "^1.2.0", "postcss": "^8.5.3", diff --git a/yarn.lock b/yarn.lock index d1934ca1dc..33173f2390 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1612,10 +1612,10 @@ eslint-plugin-vitest@^0.5.4: dependencies: "@typescript-eslint/utils" "^7.7.1" -eslint-plugin-vue@^9.32.0: - version "9.32.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.32.0.tgz#2b558e827886b567dfaa156cc1cad0f596461fab" - integrity sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug== +eslint-plugin-vue@^9.33.0: + version "9.33.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.33.0.tgz#de33eba8f78e1d172c59c8ec7fbfd60c6ca35c39" + integrity sha512-174lJKuNsuDIlLpjeXc5E2Tss8P44uIimAfGD0b90k0NoirJqpG7stLuU9Vp/9ioTOrQdWVREc4mRd1BD+CvGw== dependencies: "@eslint-community/eslint-utils" "^4.4.0" globals "^13.24.0" @@ -3484,6 +3484,7 @@ std-env@^3.8.0: integrity sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w== "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0: + name string-width-cjs version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3509,6 +3510,7 @@ string_decoder@~1.1.1: safe-buffer "~5.1.0" "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: + name strip-ansi-cjs version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== From 6365a063565bfb7213aedfc70434c805708592ca Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 19:50:25 +0000 Subject: [PATCH 04/10] Update sass to version 1.86.2 --- package.json | 2 +- yarn.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4ef790aef6..4b75f72a34 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "postcss-nested": "^6.0.1", "postcss-preset-env": "^9.6.0", "prettier": "^3.5.3", - "sass": "^1.85.1", + "sass": "^1.86.2", "typescript": "^4.6.3", "vite": "^5.4.18", "vite-plugin-ruby": "^5.1.1", diff --git a/yarn.lock b/yarn.lock index d1934ca1dc..625bba10ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3364,10 +3364,10 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass@^1.85.1: - version "1.85.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.85.1.tgz#18ab0bb48110ae99163778f06445b406148ca0d5" - integrity sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag== +sass@^1.86.2: + version "1.86.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.86.2.tgz#be41534cbe1ed3f72eae2f1290a4211682be88e3" + integrity sha512-Rpfn0zAIDqvnSb2DihJTDFjbhqLHu91Wqac9rxontWk7R+2txcPjuujMqu1eeoezh5kAblVCS5EdFdyr0Jmu+w== dependencies: chokidar "^4.0.0" immutable "^5.0.2" @@ -3484,6 +3484,7 @@ std-env@^3.8.0: integrity sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w== "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0: + name string-width-cjs version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3509,6 +3510,7 @@ string_decoder@~1.1.1: safe-buffer "~5.1.0" "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: + name strip-ansi-cjs version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== From 3813ec5d51de45d3d8ce34c5dfa6562f560a69b5 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 16 Apr 2025 12:03:14 +0100 Subject: [PATCH 05/10] fix: use built-in rails health check https://edgeapi.rubyonrails.org/classes/Rails/HealthController.html --- app/controllers/health_controller.rb | 7 ------- app/views/health/show.html.erb | 1 - config/routes.rb | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 app/controllers/health_controller.rb delete mode 100644 app/views/health/show.html.erb diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb deleted file mode 100644 index 1298857fc9..0000000000 --- a/app/controllers/health_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -# Controller to display a page stating that Limber is up, as a health check endpoint -class HealthController < ApplicationController - def show - end -end diff --git a/app/views/health/show.html.erb b/app/views/health/show.html.erb deleted file mode 100644 index 7200f7a7b9..0000000000 --- a/app/views/health/show.html.erb +++ /dev/null @@ -1 +0,0 @@ -Limber is up! diff --git a/config/routes.rb b/config/routes.rb index 68bbe622ea..9d1f74852c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,7 +3,7 @@ Rails.application.routes.draw do resources 'pipeline_work_in_progress', only: :show - get '/health', controller: :health, action: 'show', as: :health + get '/health' => 'rails/health#show', :as => :rails_health_check scope 'search', controller: :search do get '/', action: :new, as: :search From 834be959e15c6f38df8b138def046e1cca0fbb7e Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 16 Apr 2025 12:05:04 +0100 Subject: [PATCH 06/10] fix: disable ssl-redirection for health endpoint --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index fc93f9ece8..05a86b2eed 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -49,7 +49,7 @@ config.log_level = :debug # Skip http-to-https redirect for the default health check endpoint. - # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } } + config.ssl_options = { redirect: { exclude: ->(request) { request.path == '/health' } } } # Prepend all log lines with the following tags. config.log_tags = [:request_id] From c237baf002cd22f990d17c27e0f021f7aefd55ef Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 16 Apr 2025 12:36:43 +0100 Subject: [PATCH 07/10] Revert "fix: disable ssl-redirection for health endpoint" This reverts commit 834be959e15c6f38df8b138def046e1cca0fbb7e. --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 05a86b2eed..fc93f9ece8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -49,7 +49,7 @@ config.log_level = :debug # Skip http-to-https redirect for the default health check endpoint. - config.ssl_options = { redirect: { exclude: ->(request) { request.path == '/health' } } } + # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } } # Prepend all log lines with the following tags. config.log_tags = [:request_id] From fd7b6e1f1aee5ed070c7a0a17f1198625e576c4b Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 00:00:55 +0000 Subject: [PATCH 08/10] Update Ruby to version 3.3.8 --- .ruby-version | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index f092941a75..37d02a6e38 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.8 +3.3.8 diff --git a/Dockerfile b/Dockerfile index 4d8effb66f..1c5eff22e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.8-slim +FROM ruby:3.3.8-slim # Major version of Node.js to install ARG nodeVersion=22 From 89d5e716984899e6cd9bcfcc135b8d892e1376a7 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 23:00:35 +0000 Subject: [PATCH 09/10] Update nokogiri to version 1.18.8 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a679778588..8a52924ca1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -253,7 +253,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.18.6) + nokogiri (1.18.8) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) From e69ec8bf41df891cebbd9de64a28e010cc93f91e Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 23 Apr 2025 13:49:36 +0100 Subject: [PATCH 10/10] release: bump patch version --- .release-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-version b/.release-version index defa5c9fb1..8d10576302 100644 --- a/.release-version +++ b/.release-version @@ -1 +1 @@ -3.74.0 +3.74.1