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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c607a83b24051fdbbe3684054ef934e99d8ce1ed..0fd5071c24fb9081a9efa19fdef2c15413e5d688 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,20 +74,20 @@ GEM
     autoprefixer-rails (9.8.4)
       execjs
     aws-eventstream (1.1.0)
     autoprefixer-rails (9.8.4)
       execjs
     aws-eventstream (1.1.0)

-    aws-partitions (1.333.0)
-    aws-sdk-core (3.101.0)
+    aws-partitions (1.338.0)
+    aws-sdk-core (3.103.0)

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

-    aws-sdk-kms (1.35.0)
+    aws-sdk-kms (1.36.0)

       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.70.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-s3 (1.73.0)
+      aws-sdk-core (~> 3, >= 3.102.1)

       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

-    aws-sigv4 (1.2.0)
+    aws-sigv4 (1.2.1)

       aws-eventstream (~> 1, >= 1.0.2)
     better_errors (2.7.1)
       coderay (>= 1.0.0)
       aws-eventstream (~> 1, >= 1.0.2)
     better_errors (2.7.1)
       coderay (>= 1.0.0)


@@ -106,7 +106,7 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.6)
       msgpack (~> 1.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.6)
       msgpack (~> 1.0)

-    bootstrap (4.3.1)
+    bootstrap (4.5.0)

       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)


@@ -167,7 +167,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)

-    dry-schema (1.5.1)
+    dry-schema (1.5.2)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)


@@ -208,7 +208,7 @@ GEM
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.13.1)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.13.1)

-    ffi-libarchive (1.0.0)
+    ffi-libarchive (1.0.3)

       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)


@@ -219,10 +219,10 @@ GEM
     hashie (4.1.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     hashie (4.1.0)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)

-    http_accept_language (2.0.5)
-    i18n (0.9.5)
+    http_accept_language (2.1.1)
+    i18n (1.8.3)

       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.7.0)
+    i18n-js (3.7.1)

       i18n (>= 0.6.6)
     image_optim (0.26.5)
       exifr (~> 1.2, >= 1.2.2)
       i18n (>= 0.6.6)
     image_optim (0.26.5)
       exifr (~> 1.2, >= 1.2.2)


@@ -243,10 +243,10 @@ 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.3.0)
+    json (2.3.1)

     jwt (2.2.1)
     kgio (2.11.3)
     jwt (2.2.1)
     kgio (2.11.3)

-    kramdown (2.2.1)
+    kramdown (2.3.0)

       rexml
     libxml-ruby (3.2.0)
     listen (3.2.1)
       rexml
     libxml-ruby (3.2.0)
     listen (3.2.1)


@@ -328,7 +328,8 @@ GEM
     progress (3.5.2)
     psych (3.1.0)
     public_suffix (4.0.5)
     progress (3.5.2)
     psych (3.1.0)
     public_suffix (4.0.5)

-    puma (3.12.6)
+    puma (4.3.5)
+      nio4r (~> 2.0)

     quad_tile (1.0.1)
     r2 (0.2.7)
     rack (2.2.3)
     quad_tile (1.0.1)
     r2 (0.2.7)
     rack (2.2.3)


@@ -364,9 +365,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)

-    rails-i18n (4.0.2)
-      i18n (~> 0.6)
-      rails (>= 4.0)
+    rails-i18n (6.0.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 7)

     railties (6.0.3.2)
       actionpack (= 6.0.3.2)
       activesupport (= 6.0.3.2)
     railties (6.0.3.2)
       actionpack (= 6.0.3.2)
       activesupport (= 6.0.3.2)


@@ -394,7 +395,7 @@ GEM
       rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
       rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)

-    rubocop-ast (0.0.3)
+    rubocop-ast (0.1.0)

       parser (>= 2.7.0.1)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)
       parser (>= 2.7.0.1)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)


@@ -420,7 +421,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
       sprockets (> 3.0)
       sprockets-rails
       tilt

-    secure_headers (6.3.0)
+    secure_headers (6.3.1)

     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)


@@ -464,7 +465,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)

-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -482,7 +483,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)

-  bootstrap (~> 4.3.1)
+  bootstrap (~> 4.5.0)

   browser
   bzip2-ffi
   cancancan
   browser
   bzip2-ffi
   cancancan


@@ -500,7 +501,7 @@ DEPENDENCIES
   ffi-libarchive
   gd2-ffij (>= 0.4.0)
   htmlentities
   ffi-libarchive
   gd2-ffij (>= 0.4.0)
   htmlentities

-  http_accept_language (~> 2.0.0)
+  http_accept_language (~> 2.1.1)

   i18n-js (>= 3.0.0)
   image_optim_rails
   jbuilder (~> 2.7)
   i18n-js (>= 3.0.0)
   image_optim_rails
   jbuilder (~> 2.7)


@@ -526,14 +527,14 @@ DEPENDENCIES
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   psych
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   psych

-  puma (~> 3.11)
+  puma (~> 4.3)

   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   rails (= 6.0.3.2)
   rails-controller-testing
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   rails (= 6.0.3.2)
   rails-controller-testing

-  rails-i18n (~> 4.0.0)
+  rails-i18n (~> 6.0.0)

   rinku (>= 2.0.6)
   rotp
   rubocop
   rinku (>= 2.0.6)
   rotp
   rubocop