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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c313665c43485cc8c98aec8360aecd94565490dc..633b524a4ce647c3d42d195c4b77463c0524082c 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,7 +65,7 @@ GEM
       activemodel (= 7.1.2)
       activesupport (= 7.1.2)
       timeout (>= 0.4.0)
       activemodel (= 7.1.2)
       activesupport (= 7.1.2)
       timeout (>= 0.4.0)

-    activerecord-import (1.5.0)
+    activerecord-import (1.5.1)

       activerecord (>= 4.2)
     activestorage (7.1.2)
       actionpack (= 7.1.2)
       activerecord (>= 4.2)
     activestorage (7.1.2)
       actionpack (= 7.1.2)


@@ -95,8 +95,8 @@ GEM
     autoprefixer-rails (10.4.15.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     autoprefixer-rails (10.4.15.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)

-    aws-partitions (1.849.0)
-    aws-sdk-core (3.186.0)
+    aws-partitions (1.854.0)
+    aws-sdk-core (3.187.1)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)


@@ -104,7 +104,7 @@ GEM
     aws-sdk-kms (1.72.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.72.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.136.0)
+    aws-sdk-s3 (1.137.0)

       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)


@@ -228,12 +228,12 @@ GEM
     erubi (1.12.0)
     execjs (2.9.1)
     exifr (1.4.0)
     erubi (1.12.0)
     execjs (2.9.1)
     exifr (1.4.0)

-    factory_bot (6.2.1)
+    factory_bot (6.4.1)

       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)

-      factory_bot (~> 6.2.0)
+      factory_bot (~> 6.2)

       railties (>= 5.0.0)
       railties (>= 5.0.0)

-    faraday (2.7.11)
+    faraday (2.7.12)

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


@@ -251,7 +251,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.0)
+    google-protobuf (3.25.1)

     hashdiff (1.0.1)
     hashie (5.0.0)
     highline (2.1.0)
     hashdiff (1.0.1)
     hashie (5.0.0)
     highline (2.1.0)


@@ -288,7 +288,7 @@ GEM
     image_size (3.3.0)
     in_threads (1.6.0)
     io-console (0.6.0)
     image_size (3.3.0)
     in_threads (1.6.0)
     io-console (0.6.0)

-    irb (1.9.0)
+    irb (1.9.1)

       rdoc
       reline (>= 0.3.8)
     jbuilder (2.11.5)
       rdoc
       reline (>= 0.3.8)
     jbuilder (2.11.5)


@@ -340,8 +340,8 @@ GEM
       timeout
     net-smtp (0.4.0)
       net-protocol
       timeout
     net-smtp (0.4.0)
       net-protocol

-    nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nio4r (2.6.1)
+    nokogiri (1.15.5)

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


@@ -399,7 +399,7 @@ GEM
     progress (3.6.0)
     psych (5.1.1.1)
       stringio
     progress (3.6.0)
     psych (5.1.1.1)
       stringio

-    public_suffix (5.0.3)
+    public_suffix (5.0.4)

     puma (5.6.7)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     puma (5.6.7)
       nio4r (~> 2.0)
     quad_tile (1.0.1)


@@ -495,10 +495,11 @@ GEM
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

-    rubocop-rails (2.22.1)
+    rubocop-rails (2.22.2)

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

+      rubocop-ast (>= 1.30.0, < 2.0)

     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-openid (2.9.2)