From a85a35cfc91e03f810232ffa466bf6265117db8a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2019 09:58:25 -0400
Subject: [PATCH] Bump puma from 4.1.0 to 4.2.0 (#4084) [ci skip]

Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb7dae762..47534ec99 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,7 +63,7 @@ gem "omniauth", "~> 1.9" # A generalized Rack framework for multiple-provider au
 gem "omniauth-github", "~> 1.3" # OmniAuth strategy for GitHub
 gem "omniauth-twitter", "~> 1.4" # OmniAuth strategy for Twitter
 gem "pg", "~> 1.1" # Pg is the Ruby interface to the PostgreSQL RDBMS
-gem "puma", "~> 4.1" # Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
+gem "puma", "~> 4.2" # Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
 gem "pundit", "~> 2.1" # Object oriented authorization for Rails applications
 gem "pusher", "~> 1.3" # Ruby library for Pusher Channels HTTP API
 gem "pusher-push-notifications", "~> 1.1" # Pusher Push Notifications Ruby server SDK
diff --git a/Gemfile.lock b/Gemfile.lock
index c242546c2..e3da0c01e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -498,7 +498,7 @@ GEM
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    nio4r (2.4.0)
+    nio4r (2.5.1)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
@@ -546,7 +546,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.1)
-    puma (4.1.0)
+    puma (4.2.0)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -934,7 +934,7 @@ DEPENDENCIES
   pry (~> 0.12)
   pry-byebug (~> 3.7)
   pry-rails (~> 0.3)
-  puma (~> 4.1)
+  puma (~> 4.2)
   pundit (~> 2.1)
   pundit-matchers (~> 1.6)
   pusher (~> 1.3)