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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index e25cf5cd9540eaa709d3a381c54c9f4828386f01..ba539393a8169f2ddf996469351b571dea97ca0a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,13 +86,13 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     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.680.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-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)
       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)
       rexml
     crass (1.0.6)
     dalli (3.2.3)

+    date (3.3.3)

     debug_inspector (1.1.0)
     deep_merge (1.2.2)
     delayed_job (4.1.11)
     debug_inspector (1.1.0)
     deep_merge (1.2.2)
     delayed_job (4.1.11)


@@ -163,7 +164,7 @@ GEM
     docile (1.4.0)
     doorkeeper (5.6.2)
       railties (>= 5)
     docile (1.4.0)
     doorkeeper (5.6.2)
       railties (>= 5)

-    doorkeeper-i18n (5.2.5)
+    doorkeeper-i18n (5.2.6)

       doorkeeper (>= 5.2)
     dry-configurable (1.0.1)
       dry-core (~> 1.0, < 2)
       doorkeeper (>= 5.2)
     dry-configurable (1.0.1)
       dry-core (~> 1.0, < 2)


@@ -212,7 +213,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)

-    faraday (2.7.1)
+    faraday (2.7.2)

       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)


@@ -272,7 +273,7 @@ GEM
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
     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)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)


@@ -281,23 +282,24 @@ GEM
     matrix (0.4.2)
     maxminddb (0.1.22)
     method_source (1.0.0)
     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)
     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
     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
     nio4r (2.5.8)
       timeout
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)

-    nokogiri (1.13.9)
+    nokogiri (1.13.10)

       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (0.4.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth (0.4.7)


@@ -352,7 +354,7 @@ GEM
     pg (1.4.5)
     popper_js (2.11.6)
     progress (3.6.0)
     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)
     puma (5.6.5)
       nio4r (~> 2.0)
     quad_tile (1.0.1)


@@ -364,7 +366,7 @@ GEM
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

-    rack-protection (3.0.4)
+    rack-protection (3.0.5)

       rack
     rack-test (2.0.2)
       rack (>= 1.3)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)


@@ -390,8 +392,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     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)
     rails-i18n (7.0.6)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)


@@ -412,8 +414,8 @@ GEM
       rack (>= 1.4)
     rexml (3.2.5)
     rinku (2.0.6)
       rack (>= 1.4)
     rexml (3.2.5)
     rinku (2.0.6)

-    rotp (6.2.1)
-    rubocop (1.39.0)
+    rotp (6.2.2)
+    rubocop (1.41.0)

       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       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)
       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)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)


@@ -469,9 +471,9 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)

-    sprockets (4.1.1)
+    sprockets (4.2.0)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)

     sprockets-exporters_pack (0.1.2)
       brotli (>= 0.2.0)
       sprockets (>= 4.0.0.beta3)
     sprockets-exporters_pack (0.1.2)
       brotli (>= 0.2.0)
       sprockets (>= 4.0.0.beta3)


@@ -555,6 +557,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
   libxml-ruby (>= 2.0.5)
   listen
   logstasher

+  mail (~> 2.7.1)

   marcel
   maxminddb
   minitest (~> 5.1)
   marcel
   maxminddb
   minitest (~> 5.1)


@@ -598,4 +601,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
   webmock
 
 BUNDLED WITH

-   2.3.7
+   2.3.26