From d262e194c17cfdebec89999ff55a67c7d0e18edc Mon Sep 17 00:00:00 2001
From: Jan Renz <jan.renz@gmail.com>
Date: Mon, 23 Nov 2015 19:47:13 +0100
Subject: [PATCH] Update puma

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3b1b2cd2..0b94f0ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'kramdown'
 gem 'newrelic_rpm'
 gem 'pg', platform: :ruby
 gem 'pry'
-gem 'puma'
+gem 'puma', '~> 2.15.3'
 gem 'pundit'
 gem 'rails', '~> 4.1.2'
 gem 'rails-i18n', '~> 4.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index d27789ea..245de4e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,13 +185,11 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    puma (2.11.1)
-      rack (>= 1.1, < 2.0)
-    puma (2.11.1-java)
-      rack (>= 1.1, < 2.0)
+    puma (2.15.3)
+    puma (2.15.3-java)
     pundit (0.3.0)
       activesupport (>= 3.0.0)
-    rack (1.5.2)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.10)
@@ -368,7 +366,7 @@ DEPENDENCIES
   nyan-cat-formatter
   pg
   pry
-  puma
+  puma (~> 2.15.3)
   pundit
   rails (~> 4.1.2)
   rails-i18n (~> 4.0.0)