From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Dec 2022 20:22:44 +0000 (+0000)
Subject: Update bundle
X-Git-Tag: live~1379
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/02ed416e12207b1fc7866e761d206ff6bb52b98c?ds=sidebyside

Update bundle
---

diff --git a/Gemfile b/Gemfile
index f7a3e502e..f5d0f7f4f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -131,6 +131,9 @@ gem "aws-sdk-s3"
 # Used to resize user images
 gem "image_processing"
 
+# Avoid mail 2.8.0 due to https://github.com/mikel/mail/issues/1489
+gem "mail", "~> 2.7.1"
+
 # Gems useful for development
 group :development do
   gem "annotate"
diff --git a/Gemfile.lock b/Gemfile.lock
index b6e12d859..c63ef0081 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,13 +86,13 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.671.0)
-    aws-sdk-core (3.168.3)
+    aws-partitions (1.675.0)
+    aws-sdk-core (3.168.4)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.60.0)
+    aws-sdk-kms (1.61.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.117.2)
@@ -153,6 +153,7 @@ GEM
       rexml
     crass (1.0.6)
     dalli (3.2.3)
+    date (3.3.1)
     debug_inspector (1.1.0)
     deep_merge (1.2.2)
     delayed_job (4.1.11)
@@ -272,7 +273,7 @@ GEM
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -281,18 +282,19 @@ GEM
     matrix (0.4.2)
     maxminddb (0.1.22)
     method_source (1.0.0)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    net-imap (0.3.1)
+    net-imap (0.3.2)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.0)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
@@ -352,7 +354,7 @@ GEM
     pg (1.4.5)
     popper_js (2.11.6)
     progress (3.6.0)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
@@ -390,8 +392,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rails-i18n (7.0.6)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
@@ -413,7 +415,7 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.1)
-    rubocop (1.39.0)
+    rubocop (1.40.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -425,7 +427,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
-    rubocop-minitest (0.24.0)
+    rubocop-minitest (0.25.0)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
@@ -555,6 +557,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
+  mail (~> 2.7.1)
   marcel
   maxminddb
   minitest (~> 5.1)
@@ -598,4 +601,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.7
+   2.3.26