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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index b3beb4e4c1e51e8d3b9696504d88ba49220bcfd7..586f2000d854a31c58aeb5a19c5db1fd85eb42ea 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,8 +86,8 @@ 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.657.0)
-    aws-sdk-core (3.166.0)
+    aws-partitions (1.660.0)
+    aws-sdk-core (3.167.0)

       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)


@@ -146,7 +146,7 @@ GEM
     composite_primary_keys (14.0.4)
       activerecord (~> 7.0.2)
     concurrent-ruby (1.1.10)
     composite_primary_keys (14.0.4)
       activerecord (~> 7.0.2)
     concurrent-ruby (1.1.10)

-    config (4.0.0)
+    config (4.1.0)

       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.3.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.3.0)


@@ -198,7 +198,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)

-    erb_lint (0.3.0)
+    erb_lint (0.3.1)

       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)


@@ -213,10 +213,10 @@ 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.6.0)
+    faraday (2.7.0)

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

-    faraday-net_http (3.0.1)
+    faraday-net_http (3.0.2)

     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)


@@ -255,7 +255,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.1)

-    jquery-rails (4.5.0)
+    jquery-rails (4.5.1)

       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)


@@ -363,7 +363,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.2)
+    rack-protection (3.0.3)

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


@@ -411,8 +411,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.0)
-    rubocop (1.38.0)
+    rotp (6.2.1)
+    rubocop (1.39.0)

       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)


@@ -424,7 +424,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)

-    rubocop-minitest (0.23.1)
+    rubocop-minitest (0.23.2)

       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop (>= 0.90, < 2.0)
     rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)


@@ -573,7 +573,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 7.0.4)
+  rails (~> 7.0.0)

   rails-controller-testing
   rails-i18n (~> 7.0.0)
   rinku (>= 2.0.6)
   rails-controller-testing
   rails-i18n (~> 7.0.0)
   rinku (>= 2.0.6)