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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index e36316ff465928e0b2ac93e223132fc794b1201b..554c45b5ab91ac5cd2cca5948a5b2ca896b7ad85 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,20 +91,20 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)

-    aws-partitions (1.976.0)
-    aws-sdk-core (3.205.0)
+    aws-partitions (1.986.0)
+    aws-sdk-core (3.209.1)

       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)

-    aws-sdk-kms (1.91.0)
-      aws-sdk-core (~> 3, >= 3.205.0)
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)

       aws-sigv4 (~> 1.5)
       aws-sigv4 (~> 1.5)

-    aws-sdk-s3 (1.162.0)
-      aws-sdk-core (~> 3, >= 3.205.0)
+    aws-sdk-s3 (1.167.0)
+      aws-sdk-core (~> 3, >= 3.207.0)

       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.0)

       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     better_errors (2.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     better_errors (2.10.1)


@@ -151,8 +151,9 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     concurrent-ruby (1.3.4)
     childprocess (5.1.0)
       logger (~> 1.5)
     concurrent-ruby (1.3.4)

-    config (5.5.1)
+    config (5.5.2)

       deep_merge (~> 1.2, >= 1.2.1)
       deep_merge (~> 1.2, >= 1.2.1)

+      ostruct

     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal


@@ -235,8 +236,9 @@ GEM
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)

-    faraday (2.11.0)
+    faraday (2.12.0)

       faraday-net_http (>= 2.0, < 3.4)
       faraday-net_http (>= 2.0, < 3.4)

+      json

       logger
     faraday-net_http (3.3.0)
       net-http
       logger
     faraday-net_http (3.3.0)
       net-http


@@ -254,7 +256,7 @@ GEM
       ffi (>= 1.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
       ffi (>= 1.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)

-    google-protobuf (3.25.4)
+    google-protobuf (3.25.5)

     hashdiff (1.1.1)
     hashie (5.0.0)
     highline (3.1.1)
     hashdiff (1.1.1)
     hashie (5.0.0)
     highline (3.1.1)


@@ -292,7 +294,7 @@ GEM
     in_threads (1.6.0)
     iniparse (1.5.0)
     io-console (0.7.2)
     in_threads (1.6.0)
     iniparse (1.5.0)
     io-console (0.7.2)

-    irb (1.14.0)
+    irb (1.14.1)

       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)


@@ -304,7 +306,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.7.2)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.7.2)

-    jwt (2.9.0)
+    jwt (2.9.3)

       base64
     kgio (2.11.4)
     kramdown (2.4.0)
       base64
     kgio (2.11.4)
     kramdown (2.4.0)


@@ -338,7 +340,7 @@ GEM
     minitest (5.25.1)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
     minitest (5.25.1)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)

-    msgpack (1.7.2)
+    msgpack (1.7.3)

     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)


@@ -406,6 +408,7 @@ GEM
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     openstreetmap-deadlock_retry (1.3.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     openstreetmap-deadlock_retry (1.3.1)

+    ostruct (0.6.0)

     overcommit (0.64.0)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
     overcommit (0.64.0)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)


@@ -420,7 +423,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (6.0.1)
     psych (5.1.2)
       stringio
     public_suffix (6.0.1)

-    puma (5.6.8)
+    puma (5.6.9)

       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.8.1)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.8.1)


@@ -492,7 +495,7 @@ GEM
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)

-    rexml (3.3.7)
+    rexml (3.3.8)

     rinku (2.0.6)
     rotp (6.3.0)
     rouge (4.4.0)
     rinku (2.0.6)
     rotp (6.3.0)
     rouge (4.4.0)


@@ -520,7 +523,7 @@ GEM
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)

-    rubocop-rails (2.26.1)
+    rubocop-rails (2.26.2)

       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)


@@ -573,14 +576,13 @@ GEM
       activerecord (>= 5.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
       activerecord (>= 5.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

-    terser (1.2.3)
+    terser (1.2.4)

       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.4.0)
     timeout (0.4.1)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.4.0)
     timeout (0.4.1)

-    turbo-rails (2.0.7)
+    turbo-rails (2.0.10)

       actionpack (>= 6.0.0)
       actionpack (>= 6.0.0)

-      activejob (>= 6.0.0)

       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)


@@ -592,11 +594,11 @@ GEM
       simpleidn
     vendorer (0.2.0)
     version_gem (1.1.4)
       simpleidn
     vendorer (0.2.0)
     version_gem (1.1.4)

-    webmock (3.23.1)
+    webmock (3.24.0)

       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

-    webrick (1.8.1)
+    webrick (1.8.2)

     websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)


@@ -712,4 +714,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
   webmock
 
 BUNDLED WITH

-   2.5.11
+   2.5.16