From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Jul 2024 17:28:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4936'
X-Git-Tag: live~357
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2c590a0ed97a82ce3c8c87703c74b4f34f9168fb?hp=ea7b19c8fa71089bdc4a33b30f6ecf6e9fda7dfb

Merge remote-tracking branch 'upstream/pull/4936'
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 21488bc99..4c4589cce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,17 +95,17 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.947.0)
-    aws-sdk-core (3.198.0)
+    aws-partitions (1.950.0)
+    aws-sdk-core (3.200.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.86.0)
-      aws-sdk-core (~> 3, >= 3.198.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.153.0)
-      aws-sdk-core (~> 3, >= 3.198.0)
+    aws-sdk-s3 (1.155.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -192,7 +192,7 @@ GEM
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
     dry-initializer (3.1.1)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
@@ -245,7 +245,7 @@ GEM
     ffi-libarchive (1.1.14)
       ffi (~> 1.0)
     file_exists (0.2.0)
-    frozen_record (0.27.1)
+    frozen_record (0.27.2)
       activemodel
     fspath (3.1.2)
     gd2-ffij (0.4.0)
@@ -331,7 +331,7 @@ GEM
     mini_portile2 (2.8.7)
     mini_racer (0.9.0)
       libv8-node (~> 18.19.0.0)
-    minitest (5.24.0)
+    minitest (5.24.1)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
     msgpack (1.7.2)
@@ -513,7 +513,7 @@ GEM
     rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.0)
+    rubocop-rails (2.25.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -560,15 +560,15 @@ GEM
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringio (3.1.1)
-    strong_migrations (1.8.0)
-      activerecord (>= 5.2)
+    strong_migrations (2.0.0)
+      activerecord (>= 6.1)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.2.3)
       execjs (>= 0.3.0, < 3)
     thor (1.3.1)
-    tilt (2.3.0)
+    tilt (2.4.0)
     timeout (0.4.1)
     turbo-rails (2.0.5)
       actionpack (>= 6.0.0)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d0ee7165d..14df2ae4f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2604,12 +2604,6 @@ en:
       wikipedia:
         title: Log in with Wikipedia
         alt: Log in with a Wikipedia Account
-      wordpress:
-        title: Log in with Wordpress
-        alt: Log in with a Wordpress OpenID
-      aol:
-        title: Log in with AOL
-        alt: Log in with an AOL OpenID
   oauth:
     authorize:
       title: "Authorize access to your account"
diff --git a/yarn.lock b/yarn.lock
index 914ebb8c6..fe77c07e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -624,9 +624,9 @@ punycode@^2.1.0:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.9.4:
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
-  integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.2.tgz#5443b587f3bf73ac68968de491e5b25bafe04478"
+  integrity sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==
   dependencies:
     side-channel "^1.0.6"