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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 0c8b03bda03805271f95f9d35d25e28851f24ef5..de69c3bf196985f7f5799c264992336da479bbde 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,73 +3,73 @@ GEM
   specs:
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
   specs:
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)

-    actioncable (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actioncable (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

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

-    actionmailbox (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activejob (= 7.0.2.2)
-      activerecord (= 7.0.2.2)
-      activestorage (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionmailbox (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp

-    actionmailer (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      actionview (= 7.0.2.2)
-      activejob (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionmailer (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      actionview (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)

-    actionpack (7.0.2.2)
-      actionview (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionpack (7.0.2.3)
+      actionview (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)

-    actiontext (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activerecord (= 7.0.2.2)
-      activestorage (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actiontext (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

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

-    actionview (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionview (7.0.2.3)
+      activesupport (= 7.0.2.3)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    activejob (7.0.2.3)
+      activesupport (= 7.0.2.3)

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

-    activemodel (7.0.2.2)
-      activesupport (= 7.0.2.2)
-    activerecord (7.0.2.2)
-      activemodel (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

     activerecord-import (1.3.0)
       activerecord (>= 4.2)
     activerecord-import (1.3.0)
       activerecord (>= 4.2)

-    activestorage (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activejob (= 7.0.2.2)
-      activerecord (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    activestorage (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)

-    activesupport (7.0.2.2)
+    activesupport (7.0.2.3)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)


@@ -86,17 +86,17 @@ GEM
     autoprefixer-rails (10.4.2.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     autoprefixer-rails (10.4.2.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)

-    aws-partitions (1.554.0)
-    aws-sdk-core (3.126.1)
+    aws-partitions (1.571.0)
+    aws-sdk-core (3.130.0)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)

-    aws-sdk-kms (1.54.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-kms (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)

       aws-sigv4 (~> 1.1)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.112.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-s3 (1.113.0)
+      aws-sdk-core (~> 3, >= 3.127.0)

       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)


@@ -115,7 +115,7 @@ GEM
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.10.3)
+    bootsnap (1.11.1)

       msgpack (~> 1.2)
     bootstrap (4.5.3)
       autoprefixer-rails (>= 9.1.0)
       msgpack (~> 1.2)
     bootstrap (4.5.3)
       autoprefixer-rails (>= 9.1.0)


@@ -145,7 +145,7 @@ GEM
     coderay (1.1.3)
     composite_primary_keys (14.0.4)
       activerecord (~> 7.0.2)
     coderay (1.1.3)
     composite_primary_keys (14.0.4)
       activerecord (~> 7.0.2)

-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)

     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)


@@ -180,7 +180,7 @@ GEM
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)

-    dry-schema (1.9.0)
+    dry-schema (1.9.1)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)


@@ -193,12 +193,12 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)

-    dry-validation (1.7.0)
+    dry-validation (1.8.0)

       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)

-      dry-schema (~> 1.8, >= 1.8.0)
+      dry-schema (~> 1.9, >= 1.9.1)

     erb_lint (0.1.1)
       activesupport
       better_html (~> 1.0.7)
     erb_lint (0.1.1)
       activesupport
       better_html (~> 1.0.7)


@@ -210,34 +210,15 @@ GEM
     erubi (1.10.0)
     execjs (2.8.1)
     exifr (1.3.9)
     erubi (1.10.0)
     execjs (2.8.1)
     exifr (1.3.9)

-    factory_bot (6.2.0)
+    factory_bot (6.2.1)

       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)

-    faraday (1.9.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)

       ruby2_keywords (>= 0.0.4)
       ruby2_keywords (>= 0.0.4)

-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday-net_http (2.0.1)

     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)


@@ -268,7 +249,7 @@ GEM
       image_optim (~> 0.24)
       railties
       sprockets
       image_optim (~> 0.24)
       railties
       sprockets

-    image_processing (1.12.1)
+    image_processing (1.12.2)

       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     image_size (3.0.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     image_size (3.0.1)


@@ -277,7 +258,7 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)

-    jmespath (1.6.0)
+    jmespath (1.6.1)

     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)


@@ -285,7 +266,7 @@ GEM
     json (2.6.1)
     jwt (2.3.0)
     kgio (2.11.4)
     json (2.6.1)
     jwt (2.3.0)
     kgio (2.11.4)

-    kramdown (2.3.1)
+    kramdown (2.3.2)

       rexml
     libxml-ruby (3.2.2)
     listen (3.7.1)
       rexml
     libxml-ruby (3.2.2)
     listen (3.7.1)


@@ -294,7 +275,7 @@ GEM
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store

-    loofah (2.14.0)
+    loofah (2.15.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)


@@ -305,12 +286,11 @@ GEM
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)

-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)

     minitest (5.15.0)
     msgpack (1.4.5)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     minitest (5.15.0)
     msgpack (1.4.5)
     multi_json (1.15.0)
     multi_xml (0.6.0)

-    multipart-post (2.1.1)

     net-imap (0.2.3)
       digest
       net-protocol
     net-imap (0.2.3)
       digest
       net-protocol


@@ -327,8 +307,8 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
       net-protocol
       timeout
     nio4r (2.5.8)

-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)

       racc (~> 1.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       racc (~> 1.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -336,8 +316,8 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)

       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)


@@ -351,7 +331,7 @@ GEM
     omniauth-github (2.0.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.7.1)
     omniauth-github (2.0.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.7.1)

-    omniauth-google-oauth2 (1.0.0)
+    omniauth-google-oauth2 (1.0.1)

       jwt (>= 2.0)
       oauth2 (~> 1.1)
       omniauth (~> 2.0)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
       omniauth (~> 2.0)


@@ -375,14 +355,14 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)

-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.1.0)

       ast (~> 2.4.1)
       ast (~> 2.4.1)

-    pg (1.3.2)
+    pg (1.3.4)

     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)
     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)

-    puma (5.6.2)
+    puma (5.6.4)

       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)


@@ -398,20 +378,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

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

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

-      railties (= 7.0.2.2)
+      railties (= 7.0.2.3)

     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)


@@ -421,12 +401,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)

-    rails-i18n (7.0.2)
+    rails-i18n (7.0.3)

       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)

-    railties (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    railties (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)

       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)


@@ -442,23 +422,23 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)

-    rubocop (1.25.1)
+    rubocop (1.26.1)

       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml

-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)

       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)

-    rubocop-ast (1.15.2)
-      parser (>= 3.0.1.1)
-    rubocop-minitest (0.17.2)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-minitest (0.18.0)

       rubocop (>= 0.90, < 2.0)
       rubocop (>= 0.90, < 2.0)

-    rubocop-performance (1.13.2)
+    rubocop-performance (1.13.3)

       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

-    rubocop-rails (2.13.2)
+    rubocop-rails (2.14.2)

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


@@ -494,14 +474,14 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)

-    sprockets (4.0.2)
+    sprockets (4.0.3)

       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)

-    strong_migrations (0.8.0)
+    strong_migrations (1.0.0)

       activerecord (>= 5.2)
     strscan (3.0.1)
     terser (1.1.8)
       activerecord (>= 5.2)
     strscan (3.0.1)
     terser (1.1.8)


@@ -589,12 +569,12 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg

-  puma (~> 5.3)
+  puma (~> 5.6)

   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 7.0.2.2)
+  rails (= 7.0.2.3)

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