From c3d6bd787cc52421ddebe94ecd8941a68411d787 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Sep 2026 13:13:54 +0000
Subject: [PATCH 1/3] chore(deps): bump shakapacker in the shakapacker group

Bumps the shakapacker group with 1 update: [shakapacker](https://github.com/shakacode/shakapacker).


Updates `shakapacker` from 10.3.1 to 10.3.2
- [Release notes](https://github.com/shakacode/shakapacker/releases)
- [Changelog](https://github.com/shakacode/shakapacker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shakacode/shakapacker/compare/v10.3.1...v10.3.2)
chore(deps): bump shakapacker-webpack in the shakapacker group

Bumps the shakapacker group with 1 update: [shakapacker-webpack](https://github.com/shakacode/shakapacker/tree/HEAD/packages/shakapacker-webpack).


Updates `shakapacker-webpack` from 10.3.1 to 10.3.2
- [Release notes](https://github.com/shakacode/shakapacker/releases)
- [Changelog](https://github.com/shakacode/shakapacker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shakacode/shakapacker/commits/v10.3.2/packages/shakapacker-webpack)

---
updated-dependencies:
- dependency-name: shakapacker
  dependency-version: 10.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: shakapacker
- dependency-name: shakapacker-webpack
  dependency-version: 10.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: shakapacker
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 16 ++++++++--------
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 64aa48e..2a10582 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.21.2)
+    json (3.0.0)
     jwt (3.2.0)
       base64
     language_server-protocol (3.17.0.6)
@@ -289,7 +289,7 @@ GEM
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-proxy (1.0.1)
+    rack-proxy (2.0.0)
       rack (>= 2.0, < 4)
     rack-session (2.1.2)
       base64 (>= 0.1.0)
@@ -330,7 +330,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbs (4.1.3)
+    rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
@@ -409,7 +409,7 @@ GEM
       tilt
     securerandom (0.4.1)
     semantic_range (3.1.1)
-    shakapacker (10.3.1)
+    shakapacker (10.3.2)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -565,7 +565,7 @@ CHECKSUMS
   invisible_captcha (2.3.0) sha256=309ee5a5e891ecfb732c85b12f1aa9252a648df6f2761b3b41205e824e30ff15
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
+  json (3.0.0) sha256=1ff82a28c05c5cc7b646f3e3a3ac710e4ae2aa933690cba12f1f650b0ecdeb99
   jwt (3.2.0) sha256=5419b1fe37b1da0982bd07051f573a8b8789ab724c2aa7e785e4784a3ed217d7
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lastfm (1.27.4) sha256=62d9bfc64bd84143a968b1d07ea41517e9d46f742ec2d93921fc06bfe538c252
@@ -612,7 +612,7 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rack (3.2.7) sha256=93e13e1c24f93556671d85d2d79fa228c3485815c50d7e2f265b5330c6528fb7
   rack-protection (4.2.1) sha256=cf6e2842df8c55f5e4d1a4be015e603e19e9bc3a7178bae58949ccbb58558bac
-  rack-proxy (1.0.1) sha256=cd742611dc3517b6ac60c04d93b2ea7f8a83b1799f109081771ce0f5b8d6e3d7
+  rack-proxy (2.0.0) sha256=4f1d435d82afe93bc916d1226df8be307c1b808551f0ecdb56e0b668fd5756e6
   rack-session (2.1.2) sha256=595434f8c0c3473ae7d7ac56ecda6cc6dfd9d37c0b2b5255330aa1576967ffe8
   rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
   rackup (2.3.1) sha256=6c79c26753778e90983761d677a48937ee3192b3ffef6bc963c0950f94688868
@@ -622,7 +622,7 @@ CHECKSUMS
   railties (8.1.3.1) sha256=2388a232579a00cefea4487de66c8553c3408c1300abdc6cf1799d86ffb04487
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rbs (4.1.3) sha256=0c4474a9751cdc14364bfad0b3e53678323bbdc2c31683b0445932867dbab8c4
+  rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rdoc (8.0.0) sha256=03bf8c08a9639658855a0cfd77c0abca8325c227693f7f33f82957811348c469
   regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
@@ -646,7 +646,7 @@ CHECKSUMS
   sassc-rails (2.1.2) sha256=5f4fdf3881fc9bdc8e856ffbd9850d70a2878866feae8114aa45996179952db5
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   semantic_range (3.1.1) sha256=508333196ef0c7ba33e79579d4df7eb0a41080595e6a655c2515b03d634ec4a9
-  shakapacker (10.3.1) sha256=39647dfccfdc6365ca717629bea43aacd582752be552e77e8eeae495647678c4
+  shakapacker (10.3.2) sha256=cfc8fa328d39b5321912376faa13710bd1ac10bc3eab3c95e6d71eb28f9ba0e0
   snaky_hash (2.0.7) sha256=7d02c70012a3f932e48860cd024577908300c9aa615e0cb9b450aaa749cbcb4d
   sprockets (4.2.2) sha256=761e5a49f1c288704763f73139763564c845a8f856d52fba013458f8af1b59b1
   sprockets-rails (3.4.2) sha256=36d6327757ccf7460a00d1d52b2d5ef0019a4670503046a129fa1fb1300931ad
diff --git a/package.json b/package.json
index 6b996c5..cbd9d98 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "css-loader": "^7.1.5",
     "mini-css-extract-plugin": "^2.0.0",
     "sass-loader": "^17.0.1",
-    "shakapacker-webpack": "^10.3.1",
+    "shakapacker-webpack": "^10.3.2",
     "style-loader": "^4.0.0",
     "swc-loader": "^0.2.0",
     "terser-webpack-plugin": "^5.3.1",
diff --git a/yarn.lock b/yarn.lock
index 58716f7..5379812 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2066,18 +2066,18 @@ setprototypeof@1.2.0, setprototypeof@~1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-shakapacker-webpack@^10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/shakapacker-webpack/-/shakapacker-webpack-10.3.1.tgz#9b62faac0c4be601063fc88c009224d2bf25cb11"
-  integrity sha512-WpCcf4V2Ev3sn6GpAoIl2TTAGCbQKQ44jIWmEeu0Bd62JFK3gr80ROWJQ98ZmKDZuo8ZULVYuWsy7XgWBgVOhA==
+shakapacker-webpack@^10.3.2:
+  version "10.3.2"
+  resolved "https://registry.yarnpkg.com/shakapacker-webpack/-/shakapacker-webpack-10.3.2.tgz#22224b314fcd981085b566d8f9d5d2b41474aa90"
+  integrity sha512-cxSaNuaIsgjbTF7IyMNuK557eyzUooVzjnTHJNp8hK9Dh2oocRw6HiNqp509QciH8gwuAwKEiNOnAqtN9fXr5A==
   dependencies:
-    shakapacker "~10.3.1"
+    shakapacker "~10.3.2"
     terser-webpack-plugin "^5.3.1"
 
-shakapacker@~10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-10.3.1.tgz#f92047ac89534cbedd8ac01864facc122e128b22"
-  integrity sha512-yYSbA+JaFisZQL9ImB9IMmPNKUzm0Ycw/wUnwf88f7BeHX9k/M4FIa/4syq/0xx18JqgEL3MIJmsM0RaXQ5zuA==
+shakapacker@~10.3.2:
+  version "10.3.2"
+  resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-10.3.2.tgz#cc8047b8fa67e0b141c8c1a428bc7992967ce62a"
+  integrity sha512-W4LV0MFS1c6ayODF/Ra4RM5xS3DljBc9XGLqz04WGSap97U5gJ7FjBTChPmoJ/7VDiTYmL1w+vh+D360e9qK7Q==
   dependencies:
     js-yaml "^4.1.0"
     pack-config-diff "^0.1.0"

From bc927b7cd5ccbf53e20dd42e421bc77d6bf06812 Mon Sep 17 00:00:00 2001
From: Pat Allan <pat@freelancing-gods.com>
Date: Tue, 8 Sep 2026 15:48:15 +0100
Subject: [PATCH 2/3] Fix database preparation for CI

---
 bin/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/bootstrap b/bin/bootstrap
index ee5ff94..fbc88ae 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -6,4 +6,4 @@ cd "$(dirname "$0")/.."
 yarn install
 
 ./bin/bundle install
-./bin/rails db:create db:migrate
\ No newline at end of file
+./bin/rails db:create db:setup

From 5b213247a84a981d9cf963314fc0826581645dea Mon Sep 17 00:00:00 2001
From: Pat Allan <pat@freelancing-gods.com>
Date: Tue, 8 Sep 2026 15:58:46 +0100
Subject: [PATCH 3/3] Downgrade json to v2 for Rails compatibility

---
 Gemfile      |  1 +
 Gemfile.lock | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb5930e..745b400 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ gem "decent_exposure"
 gem "devise"
 gem "faraday"
 gem "invisible_captcha"
+gem "json", "< 3" # v3 unsupported by Rails 8.1.3.1
 gem "lastfm"
 gem "musicbrainz", :git => "https://github.com/inkstak/musicbrainz.git"
 gem "nokogiri"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a10582..ea5aa09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,7 +189,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (3.0.0)
+    json (2.21.2)
     jwt (3.2.0)
       base64
     language_server-protocol (3.17.0.6)
@@ -418,8 +418,8 @@ GEM
     snaky_hash (2.0.7)
       hashie (>= 0.1.0, < 6)
       version_gem (~> 1.1, >= 1.1.14)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
+    sprockets (4.4.1)
+      concurrent-ruby (~> 1.1)
       logger
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
@@ -478,6 +478,7 @@ DEPENDENCIES
   dotenv-rails
   faraday
   invisible_captcha
+  json (< 3)
   lastfm
   musicbrainz!
   nokogiri
@@ -565,7 +566,7 @@ CHECKSUMS
   invisible_captcha (2.3.0) sha256=309ee5a5e891ecfb732c85b12f1aa9252a648df6f2761b3b41205e824e30ff15
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (3.0.0) sha256=1ff82a28c05c5cc7b646f3e3a3ac710e4ae2aa933690cba12f1f650b0ecdeb99
+  json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   jwt (3.2.0) sha256=5419b1fe37b1da0982bd07051f573a8b8789ab724c2aa7e785e4784a3ed217d7
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lastfm (1.27.4) sha256=62d9bfc64bd84143a968b1d07ea41517e9d46f742ec2d93921fc06bfe538c252
@@ -648,7 +649,7 @@ CHECKSUMS
   semantic_range (3.1.1) sha256=508333196ef0c7ba33e79579d4df7eb0a41080595e6a655c2515b03d634ec4a9
   shakapacker (10.3.2) sha256=cfc8fa328d39b5321912376faa13710bd1ac10bc3eab3c95e6d71eb28f9ba0e0
   snaky_hash (2.0.7) sha256=7d02c70012a3f932e48860cd024577908300c9aa615e0cb9b450aaa749cbcb4d
-  sprockets (4.2.2) sha256=761e5a49f1c288704763f73139763564c845a8f856d52fba013458f8af1b59b1
+  sprockets (4.4.1) sha256=fbd665edad0916de5c7abefef0fc616866a60c5e48ce2846f39ac3fc5df9e184
   sprockets-rails (3.4.2) sha256=36d6327757ccf7460a00d1d52b2d5ef0019a4670503046a129fa1fb1300931ad
   sslocal (0.1.1) sha256=e2c668a7a9f1ac289a3a7b8c2ee4e468d252f56f714bdc396f9430f0b2db4f29
   ssrf_filter (1.5.0) sha256=e03dcdb9d1730d7f6710532a606b3543df2a448a0293ce04a2d995523c5a97f6