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

diff --git a/Gemfile b/Gemfile
index 4699438a12a1be0399e785843e0175edd7e46550..896a840c2a7699937cf8cb88557aaabbfa2700da 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -145,7 +145,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 4.3"
+  gem "puma", "~> 5.0"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c2d967fcd3a89130d411918774919ce5a8655bf..10cded38531edf4bd026f7a50a606270d39cec3b 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -280,7 +280,7 @@ GEM
     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)
@@ -333,7 +333,7 @@ GEM
     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)
@@ -536,7 +536,7 @@ DEPENDENCIES
   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