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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index f496e5a98cdd0dd726e0ddf1d6bc40b3db085c03..554c45b5ab91ac5cd2cca5948a5b2ca896b7ad85 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,86 +3,82 @@ GEM
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)
   specs:
     aasm (5.5.0)
       concurrent-ruby (~> 1.0)

-    actioncable (7.1.4)
-      actionpack (= 7.1.4)
-      activesupport (= 7.1.4)
+    actioncable (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)

-    actionmailbox (7.1.4)
-      actionpack (= 7.1.4)
-      activejob (= 7.1.4)
-      activerecord (= 7.1.4)
-      activestorage (= 7.1.4)
-      activesupport (= 7.1.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.4)
-      actionpack (= 7.1.4)
-      actionview (= 7.1.4)
-      activejob (= 7.1.4)
-      activesupport (= 7.1.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.0)
+      actionpack (= 7.2.0)
+      activejob (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
+      mail (>= 2.8.0)
+    actionmailer (7.2.0)
+      actionpack (= 7.2.0)
+      actionview (= 7.2.0)
+      activejob (= 7.2.0)
+      activesupport (= 7.2.0)
+      mail (>= 2.8.0)

       rails-dom-testing (~> 2.2)
       rails-dom-testing (~> 2.2)

-    actionpack (7.1.4)
-      actionview (= 7.1.4)
-      activesupport (= 7.1.4)
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)

       nokogiri (>= 1.8.5)
       racc
       nokogiri (>= 1.8.5)
       racc

-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)

       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)

+      useragent (~> 0.16)

     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)

-    actiontext (7.1.4)
-      actionpack (= 7.1.4)
-      activerecord (= 7.1.4)
-      activestorage (= 7.1.4)
-      activesupport (= 7.1.4)
+    actiontext (7.2.0)
+      actionpack (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)

       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)

-    actionview (7.1.4)
-      activesupport (= 7.1.4)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)

       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (7.1.4)
-      activesupport (= 7.1.4)
+    activejob (7.2.0)
+      activesupport (= 7.2.0)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (7.1.4)
-      activesupport (= 7.1.4)
-    activerecord (7.1.4)
-      activemodel (= 7.1.4)
-      activesupport (= 7.1.4)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activerecord (7.2.0)
+      activemodel (= 7.2.0)
+      activesupport (= 7.2.0)

       timeout (>= 0.4.0)
     activerecord-import (1.8.1)
       activerecord (>= 4.2)
       timeout (>= 0.4.0)
     activerecord-import (1.8.1)
       activerecord (>= 4.2)

-    activestorage (7.1.4)
-      actionpack (= 7.1.4)
-      activejob (= 7.1.4)
-      activerecord (= 7.1.4)
-      activesupport (= 7.1.4)
+    activestorage (7.2.0)
+      actionpack (= 7.2.0)
+      activejob (= 7.2.0)
+      activerecord (= 7.2.0)
+      activesupport (= 7.2.0)

       marcel (~> 1.0)
       marcel (~> 1.0)

-    activesupport (7.1.4)
+    activesupport (7.2.0)

       base64
       bigdecimal
       base64
       bigdecimal

-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)

       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)

+      logger (>= 1.4.2)

       minitest (>= 5.1)
       minitest (>= 5.1)

-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)

     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     annotate (3.2.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     annotate (3.2.0)


@@ -95,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.972.0)
-    aws-sdk-core (3.203.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.89.0)
-      aws-sdk-core (~> 3, >= 3.203.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.160.0)
-      aws-sdk-core (~> 3, >= 3.203.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)


@@ -155,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


@@ -239,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


@@ -258,14 +256,14 @@ 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)
       reline
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     hashdiff (1.1.1)
     hashie (5.0.0)
     highline (3.1.1)
       reline
     htmlentities (4.3.4)
     http_accept_language (2.1.1)

-    i18n (1.14.5)
+    i18n (1.14.6)

       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)


@@ -296,10 +294,10 @@ 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)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)

-    jbuilder (2.12.0)
+    jbuilder (2.13.0)

       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)


@@ -308,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.8.2)
+    jwt (2.9.3)

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


@@ -342,10 +340,10 @@ 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_json (1.15.0)

-    multi_xml (0.6.0)
-    mutex_m (0.2.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)

     net-http (0.4.1)
       uri
     net-imap (0.4.16)
     net-http (0.4.1)
       uri
     net-imap (0.4.16)


@@ -384,8 +382,8 @@ GEM
     omniauth-github (2.0.1)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
     omniauth-github (2.0.1)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)

-    omniauth-google-oauth2 (1.1.3)
-      jwt (>= 2.0)
+    omniauth-google-oauth2 (1.2.0)
+      jwt (>= 2.9)

       oauth2 (~> 2.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)


@@ -410,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)


@@ -424,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)


@@ -445,20 +444,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
     rackup (1.0.0)
       rack (< 3)
       webrick

-    rails (7.1.4)
-      actioncable (= 7.1.4)
-      actionmailbox (= 7.1.4)
-      actionmailer (= 7.1.4)
-      actionpack (= 7.1.4)
-      actiontext (= 7.1.4)
-      actionview (= 7.1.4)
-      activejob (= 7.1.4)
-      activemodel (= 7.1.4)
-      activerecord (= 7.1.4)
-      activestorage (= 7.1.4)
-      activesupport (= 7.1.4)
+    rails (7.2.0)
+      actioncable (= 7.2.0)
+      actionmailbox (= 7.2.0)
+      actionmailer (= 7.2.0)
+      actionpack (= 7.2.0)
+      actiontext (= 7.2.0)
+      actionview (= 7.2.0)
+      activejob (= 7.2.0)
+      activemodel (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)

       bundler (>= 1.15.0)
       bundler (>= 1.15.0)

-      railties (= 7.1.4)
+      railties (= 7.2.0)

     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)


@@ -476,10 +475,10 @@ GEM
     rails_param (1.3.1)
       actionpack (>= 3.2.0)
       activesupport (>= 3.2.0)
     rails_param (1.3.1)
       actionpack (>= 3.2.0)
       activesupport (>= 3.2.0)

-    railties (7.1.4)
-      actionpack (= 7.1.4)
-      activesupport (= 7.1.4)
-      irb
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
+      irb (~> 1.13)

       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)


@@ -496,10 +495,10 @@ 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)
     rinku (2.0.6)
     rotp (6.3.0)

-    rouge (4.3.0)
+    rouge (4.4.0)

     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
     rubocop (1.66.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
     rubocop (1.66.1)


@@ -521,10 +520,10 @@ GEM
     rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)

-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)

       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       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)


@@ -543,6 +542,7 @@ GEM
     sass-embedded (1.64.2)
       google-protobuf (~> 3.23)
       rake (>= 13.0.0)
     sass-embedded (1.64.2)
       google-protobuf (~> 3.23)
       rake (>= 13.0.0)

+    securerandom (0.3.1)

     selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
     selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)


@@ -576,29 +576,29 @@ 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.6)
+    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)

-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)

     uri (0.13.1)
     uri (0.13.1)

+    useragent (0.16.10)

     validates_email_format_of (1.8.2)
       i18n (>= 0.8.0)
       simpleidn
     vendorer (0.2.0)
     version_gem (1.1.4)
     validates_email_format_of (1.8.2)
       i18n (>= 0.8.0)
       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)


@@ -670,7 +670,6 @@ DEPENDENCIES
   minitest (~> 5.1)
   minitest-focus
   multi_json
   minitest (~> 5.1)
   minitest-focus
   multi_json

-  multi_xml (~> 0.6.0)

   omniauth (~> 2.0.2)
   omniauth-facebook
   omniauth-github
   omniauth (~> 2.0.2)
   omniauth-facebook
   omniauth-github


@@ -686,7 +685,7 @@ DEPENDENCIES
   quad_tile (~> 1.0.1)
   rack-cors
   rack-uri_sanitizer
   quad_tile (~> 1.0.1)
   rack-cors
   rack-uri_sanitizer

-  rails (~> 7.1.0)
+  rails (~> 7.2.0)

   rails-controller-testing
   rails-i18n (~> 7.0.0)
   rails_param
   rails-controller-testing
   rails-i18n (~> 7.0.0)
   rails_param


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

-   2.4.19
+   2.5.16