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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c599f16d2d869c3b3c56516a902c35b81852b2b8..388023ceed3d4e5ca0124ae07d58d4828eb7ab71 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,16 +74,16 @@ GEM
     autoprefixer-rails (9.8.4)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.335.0)
-    aws-sdk-core (3.102.1)
+    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-sdk-kms (1.35.0)
+    aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.71.1)
+    aws-sdk-s3 (1.73.0)
       aws-sdk-core (~> 3, >= 3.102.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -220,9 +220,9 @@ GEM
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
-    i18n (0.9.5)
+    i18n (1.8.3)
       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)
@@ -243,10 +243,10 @@ GEM
       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)
-    kramdown (2.2.1)
+    kramdown (2.3.0)
       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)
-    puma (3.12.6)
+    puma (4.3.5)
+      nio4r (~> 2.0)
     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)
-    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)
@@ -464,7 +465,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.3.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby
@@ -526,14 +527,14 @@ DEPENDENCIES
   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
-  rails-i18n (~> 4.0.0)
+  rails-i18n (~> 6.0.0)
   rinku (>= 2.0.6)
   rotp
   rubocop