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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4c4589cce20f96372e8f1b382e3d97b11ce0ed68..412ef4820a8e63330c8501f1e840b1e1bf5ca318 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,19 +95,19 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.3.0)

-    aws-partitions (1.950.0)
-    aws-sdk-core (3.200.0)
+    aws-partitions (1.956.0)
+    aws-sdk-core (3.201.1)

       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
       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.87.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.155.0)
-      aws-sdk-core (~> 3, >= 3.199.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)

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

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

     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)


@@ -186,7 +186,7 @@ GEM
       doorkeeper (>= 5.5, < 5.8)
       jwt (>= 2.5)
     drb (2.2.1)
       doorkeeper (>= 5.5, < 5.8)
       jwt (>= 2.5)
     drb (2.2.1)

-    dry-configurable (1.1.0)
+    dry-configurable (1.2.0)

       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
     dry-core (1.0.1)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
     dry-core (1.0.1)


@@ -234,8 +234,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.9.2)
+    faraday (2.10.0)

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

+      logger

     faraday-net_http (3.1.0)
       net-http
     ffi (1.17.0)
     faraday-net_http (3.1.0)
       net-http
     ffi (1.17.0)


@@ -255,7 +256,8 @@ GEM
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     hashie (5.0.0)
     google-protobuf (3.25.3)
     hashdiff (1.1.0)
     hashie (5.0.0)

-    highline (3.0.1)
+    highline (3.1.0)
+      reline

     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     i18n (1.14.5)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     i18n (1.14.5)


@@ -288,7 +290,7 @@ GEM
     image_size (3.4.0)
     in_threads (1.6.0)
     io-console (0.7.2)
     image_size (3.4.0)
     in_threads (1.6.0)
     io-console (0.7.2)

-    irb (1.13.2)
+    irb (1.14.0)

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


@@ -326,7 +328,7 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     maxminddb (0.1.22)
     marcel (1.0.4)
     matrix (0.4.2)
     maxminddb (0.1.22)

-    mini_magick (4.13.1)
+    mini_magick (4.13.2)

     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     mini_racer (0.9.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     mini_racer (0.9.0)


@@ -402,7 +404,7 @@ GEM
       omniauth (~> 2.0)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.25.1)
       omniauth (~> 2.0)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.25.1)

-    parser (3.3.3.0)
+    parser (3.3.4.0)

       ast (~> 2.4.1)
       racc
     pg (1.5.6)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)


@@ -483,20 +485,20 @@ 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.1)
+    rexml (3.3.2)

       strscan
     rinku (2.0.6)
     rotp (6.3.0)
     rouge (4.3.0)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
       strscan
     rinku (2.0.6)
     rotp (6.3.0)
     rouge (4.3.0)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)

-    rubocop (1.64.1)
+    rubocop (1.65.0)

       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)

-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)

       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)


@@ -507,7 +509,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)

-    rubocop-minitest (0.35.0)
+    rubocop-minitest (0.35.1)

       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.21.1)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.21.1)


@@ -560,8 +562,8 @@ GEM
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringio (3.1.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringio (3.1.1)

-    strong_migrations (2.0.0)
-      activerecord (>= 6.1)
+    strong_migrations (1.8.0)
+      activerecord (>= 5.2)

     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)


@@ -588,7 +590,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.8.1)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.8.1)

-    websocket (1.2.10)
+    websocket (1.2.11)

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


@@ -693,7 +695,7 @@ DEPENDENCIES
   simplecov
   simplecov-lcov
   sprockets-exporters_pack
   simplecov
   simplecov-lcov
   sprockets-exporters_pack

-  strong_migrations
+  strong_migrations (< 2.0.0)

   terser
   turbo-rails
   unicode-display_width
   terser
   turbo-rails
   unicode-display_width