From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Jan 2024 18:54:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4452'
X-Git-Tag: live~403
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6892ccd0155b431cc567b4744b1e2759df3e8c68?hp=6427f68ea744fe8b6c8b427d6be7e1729c67f138

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 1e18afd83..97bb72e0a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,6 +37,9 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Max: 150
 
+Minitest/MultipleAssertions:
+  Enabled: false
+
 Naming/FileName:
   Exclude:
     - 'script/deliver-message'
diff --git a/Gemfile.lock b/Gemfile.lock
index 96ece492d..aecaa7fdf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.875.0)
+    aws-partitions (1.876.0)
     aws-sdk-core (3.190.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -229,9 +229,9 @@ GEM
     erubi (1.12.0)
     execjs (2.9.1)
     exifr (1.4.0)
-    factory_bot (6.4.4)
+    factory_bot (6.4.5)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.2)
+    factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     faraday (2.8.1)
@@ -379,7 +379,8 @@ GEM
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
-    omniauth-microsoft_graph (1.2.0)
+    omniauth-microsoft_graph (2.0.0)
+      jwt (~> 2.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8.0)
     omniauth-oauth (1.2.0)
@@ -415,7 +416,8 @@ GEM
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-protection (3.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-session (1.0.2)
       rack (< 3)
@@ -496,7 +498,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-minitest (0.34.2)
+    rubocop-minitest (0.34.3)
       rubocop (>= 1.39, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-performance (1.20.1)