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

diff --git a/Gemfile b/Gemfile
index fd1df513cc0dfd448a4e0bca3710b881020d2bc7..10e34638eb8d294706f9d7cf8ca543418ec28380 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -136,7 +136,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 5.0"
+  gem "puma", "~> 5.3"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"

diff --git a/Gemfile.lock b/Gemfile.lock
index af52b2d01e8df92b08a1ca73db127e1d9dc7f846..c01eeb372f470ece299eb32e35bcc7edce9716a7 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -335,7 +335,7 @@ GEM
     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)
-    puma (5.3.0)
+    puma (5.3.1)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
@@ -536,7 +536,7 @@ DEPENDENCIES
   omniauth-windowslive
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
-  puma (~> 5.0)
+  puma (~> 5.3)
   quad_tile (~> 1.0.1)
   r2 (~> 0.2.7)
   rack-cors