From 546d7b4ad4ed0bd7887cb8fcb9e1317253c15c6e Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 3 May 2013 00:14:29 +0200
Subject: [PATCH] Set puma's version to 1.6.3

Newest version has problems with logs and newrelic
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5d1c830b..94fd20a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require:
 # TODO need to release the gem as soon i'm certain this change makes sense
 gem 'simple_states',      github: 'svenfuchs/simple_states', branch: 'sf-set-state-early'
 
-gem 'puma'
+gem 'puma', '1.6.3'
 gem "sentry-raven",    github: 'getsentry/raven-ruby'
 gem 'yard-sinatra',    github: 'rkh/yard-sinatra'
 gem 'rack-contrib',    github: 'rack/rack-contrib'
diff --git a/Gemfile.lock b/Gemfile.lock
index dd8a9117..c1f9a7c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -205,8 +205,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puma (2.0.1)
-      rack (>= 1.1, < 2.0)
+    puma (1.6.3)
+      rack (~> 1.2)
     pusher (0.11.3)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
@@ -303,7 +303,7 @@ DEPENDENCIES
   micro_migrations!
   mocha (~> 0.12)
   pry
-  puma
+  puma (= 1.6.3)
   rack-cache (~> 1.2)
   rack-contrib!
   rake (~> 0.9.2)