From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2020 18:24:52 +0000 (+0000) Subject: Bump puma from 3.12.6 to 4.3.5 X-Git-Tag: live~2606^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/bb8d35df3b937579adf4d348db9f1f274308fd8c Bump puma from 3.12.6 to 4.3.5 Bumps [puma](https://github.com/puma/puma) from 3.12.6 to 4.3.5. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/commits) Signed-off-by: dependabot[bot] --- diff --git a/Gemfile b/Gemfile index 95958032c..8b606ddd5 100644 --- a/Gemfile +++ b/Gemfile @@ -143,7 +143,7 @@ group :test do gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" - gem "puma", "~> 3.11" + gem "puma", "~> 4.3" gem "rails-controller-testing" gem "rubocop" gem "rubocop-minitest" diff --git a/Gemfile.lock b/Gemfile.lock index 686bca1ed..979b4c90c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -526,7 +527,7 @@ 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