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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 615787927535ff0866783ab0cdbd4c7d6e68f4e5..0ca767c00a12e851e429b91aa2bafc4f515be6f5 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,7 +60,7 @@ GEM
       activemodel (= 7.2.2.1)
       activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)
       activemodel (= 7.2.2.1)
       activesupport (= 7.2.2.1)
       timeout (>= 0.4.0)

-    activerecord-import (2.0.0)
+    activerecord-import (2.1.0)

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


@@ -85,23 +85,24 @@ GEM
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)

-    argon2 (2.3.0)
+    argon2 (2.3.2)

       ffi (~> 1.15)
       ffi-compiler (~> 1.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
       ffi (~> 1.15)
       ffi-compiler (~> 1.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)

-    aws-eventstream (1.3.0)
-    aws-partitions (1.1040.0)
-    aws-sdk-core (3.216.0)
+    aws-eventstream (1.3.1)
+    aws-partitions (1.1050.0)
+    aws-sdk-core (3.218.1)

       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)

+      base64

       jmespath (~> 1, >= 1.6.1)
       jmespath (~> 1, >= 1.6.1)

-    aws-sdk-kms (1.97.0)
+    aws-sdk-kms (1.98.0)

       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)

-    aws-sdk-s3 (1.178.0)
+    aws-sdk-s3 (1.181.0)

       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)


@@ -134,13 +135,12 @@ GEM
     brakeman (7.0.0)
       racc
     brotli (0.6.0)
     brakeman (7.0.0)
       racc
     brotli (0.6.0)

-    browser (5.3.1)

     builder (3.3.0)
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
     cancancan (3.6.1)
     builder (3.3.0)
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
     cancancan (3.6.1)

-    canonical-rails (0.2.16)
-      actionview (>= 4.1, < 7.3)
+    canonical-rails (0.2.17)
+      actionview (>= 4.1, < 8.1)

     capybara (3.40.0)
       addressable
       matrix
     capybara (3.40.0)
       addressable
       matrix


@@ -212,9 +212,10 @@ GEM
       railties (>= 5)
     doorkeeper-i18n (5.2.7)
       doorkeeper (>= 5.2)
       railties (>= 5)
     doorkeeper-i18n (5.2.7)
       doorkeeper (>= 5.2)

-    doorkeeper-openid_connect (1.8.10)
+    doorkeeper-openid_connect (1.8.11)

       doorkeeper (>= 5.5, < 5.9)
       jwt (>= 2.5)
       doorkeeper (>= 5.5, < 5.9)
       jwt (>= 2.5)

+      ostruct (>= 0.5)

     drb (2.2.1)
     dry-configurable (1.3.0)
       dry-core (~> 1.1)
     drb (2.2.1)
     dry-configurable (1.3.0)
       dry-core (~> 1.1)


@@ -238,7 +239,7 @@ GEM
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
       dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)

-    dry-types (1.8.1)
+    dry-types (1.8.2)

       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)


@@ -261,8 +262,8 @@ GEM
     erubi (1.13.1)
     execjs (2.10.0)
     exifr (1.4.1)
     erubi (1.13.1)
     execjs (2.10.0)
     exifr (1.4.1)

-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)

     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)


@@ -291,7 +292,7 @@ GEM
       rchardet (~> 1.8)
     globalid (1.2.1)
       activesupport (>= 6.1)
       rchardet (~> 1.8)
     globalid (1.2.1)
       activesupport (>= 6.1)

-    google-protobuf (3.25.5)
+    google-protobuf (3.25.6)

     hashdiff (1.1.2)
     hashie (5.0.0)
     highline (3.1.2)
     hashdiff (1.1.2)
     hashie (5.0.0)
     highline (3.1.2)


@@ -322,14 +323,14 @@ GEM
       image_optim (~> 0.24)
       railties
       sprockets
       image_optim (~> 0.24)
       railties
       sprockets

-    image_processing (1.13.0)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)

       ruby-vips (>= 2.0.17, < 3)
     image_size (3.4.0)
     in_threads (1.6.0)
     iniparse (1.5.0)
     io-console (0.8.0)
       ruby-vips (>= 2.0.17, < 3)
     image_size (3.4.0)
     in_threads (1.6.0)
     iniparse (1.5.0)
     io-console (0.8.0)

-    irb (1.15.0)
+    irb (1.15.1)

       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)


@@ -341,7 +342,7 @@ GEM
       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)

-    json (2.9.1)
+    json (2.10.1)

     jwt (2.10.1)
       base64
     kgio (2.11.4)
     jwt (2.10.1)
       base64
     kgio (2.11.4)


@@ -349,13 +350,14 @@ GEM
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)

-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)

     libv8-node (18.19.0.0)
     libxml-ruby (5.0.3)
     libv8-node (18.19.0.0)
     libxml-ruby (5.0.3)

+    lint_roller (1.1.0)

     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)

-    logger (1.6.5)
+    logger (1.6.6)

     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store


@@ -370,7 +372,9 @@ 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.2)
+    mini_magick (5.1.2)
+      benchmark
+      logger

     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     mini_racer (0.9.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     mini_racer (0.9.0)


@@ -378,21 +382,21 @@ GEM
     minitest (5.25.4)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)
     minitest (5.25.4)
     minitest-focus (1.4.0)
       minitest (>= 4, < 6)

-    msgpack (1.7.5)
+    msgpack (1.8.0)

     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     nap (1.1.0)
     net-http (0.6.0)
       uri
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     nap (1.1.0)
     net-http (0.6.0)
       uri

-    net-imap (0.5.5)
+    net-imap (0.5.6)

       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout

-    net-smtp (0.5.0)
+    net-smtp (0.5.1)

       net-protocol
     nio4r (2.7.4)
     nokogiri (1.18.2)
       net-protocol
     nio4r (2.7.4)
     nokogiri (1.18.2)


@@ -452,12 +456,12 @@ GEM
     open4 (1.3.4)
     openstreetmap-deadlock_retry (1.3.1)
     ostruct (0.6.1)
     open4 (1.3.4)
     openstreetmap-deadlock_retry (1.3.1)
     ostruct (0.6.1)

-    overcommit (0.64.1)
+    overcommit (0.66.0)

       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.26.3)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.26.3)

-    parser (3.3.7.0)
+    parser (3.3.7.1)

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


@@ -475,7 +479,7 @@ GEM
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.8.1)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     racc (1.8.1)

-    rack (2.2.10)
+    rack (2.2.11)

     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-openid (1.4.2)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-openid (1.4.2)


@@ -537,7 +541,7 @@ GEM
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.9.0)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.9.0)

-    rdoc (6.11.0)
+    rdoc (6.12.0)

       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.0)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.0)


@@ -550,17 +554,18 @@ GEM
     rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
     rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)

-    rubocop (1.70.0)
+    rubocop (1.72.0)

       json (~> 2.3)
       json (~> 2.3)

-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)

       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)

-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)

       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)

-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)

       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)


@@ -572,7 +577,7 @@ GEM
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)

-    rubocop-rails (2.29.0)
+    rubocop-rails (2.29.1)

       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)


@@ -581,7 +586,7 @@ GEM
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.13.0)
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.13.0)

-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)

       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)
       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)


@@ -623,7 +628,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)

-    stringio (3.1.2)
+    stringio (3.1.3)

     strong_migrations (1.8.0)
       activerecord (>= 5.2)
     teaspoon (1.4.0)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
     teaspoon (1.4.0)


@@ -650,7 +655,7 @@ GEM
       simpleidn
     vendorer (0.2.0)
     version_gem (1.1.4)
       simpleidn
     vendorer (0.2.0)
     version_gem (1.1.4)

-    webmock (3.24.0)
+    webmock (3.25.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)


@@ -683,7 +688,6 @@ DEPENDENCIES
   bootstrap (~> 5.3.2)
   bootstrap_form (~> 5.0)
   brakeman
   bootstrap (~> 5.3.2)
   bootstrap_form (~> 5.0)
   brakeman

-  browser (< 6)

   bzip2-ffi
   cancancan
   canonical-rails
   bzip2-ffi
   cancancan
   canonical-rails