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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c2d967fcd3a89130d411918774919ce5a8655bf..39f3b312b533afd098e225b8012146eb2ff96081 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,7 +71,7 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)

-    autoprefixer-rails (10.0.0.2)
+    autoprefixer-rails (10.0.1.0)

       execjs
     aws-eventstream (1.1.0)
     aws-partitions (1.376.0)
       execjs
     aws-eventstream (1.1.0)
     aws-partitions (1.376.0)


@@ -280,7 +280,7 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)

-    nio4r (2.5.3)
+    nio4r (2.5.4)

     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)


@@ -333,7 +333,7 @@ GEM
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)

-    puma (4.3.6)
+    puma (5.0.2)

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


@@ -536,7 +536,7 @@ DEPENDENCIES
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   psych
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   psych

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

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