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

diff --git a/Gemfile b/Gemfile
index 02e5e309f791175753493011d21ed8aed5c88f71..a0dce8dbcf1505e3b0f638fd4251136f641d744d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -144,7 +144,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 5.3"
+  gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"

diff --git a/Gemfile.lock b/Gemfile.lock
index b4aca513aebb6d3d51fa18b516c50c808602a148..de69c3bf196985f7f5799c264992336da479bbde 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -362,7 +362,7 @@ GEM
     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)
@@ -569,7 +569,7 @@ DEPENDENCIES
   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