From 90327a05e5c5b593b70b6887344beaaef996bca9 Mon Sep 17 00:00:00 2001
From: Thibault Jouan <tj@a13.fr>
Date: Sat, 12 May 2012 15:54:26 +0000
Subject: [PATCH] Bundle thin so that it can be used instead of WEBrick

---
 Gemfile      | 1 +
 Gemfile.lock | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/Gemfile b/Gemfile
index f70afb8..80f9cb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ gem 'bcrypt-ruby', '~> 3.0'
 gem 'rabl', '~> 0.6'
 
 group :development, :test do
+  gem 'thin', '~> 1.3'
   gem 'rspec-rails', '~> 2.6'
   gem 'capybara', '~> 1.1'
   gem 'factory_girl_rails', '~> 1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index acaa8a1..56dffe2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,8 +40,10 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.1)
       ffi (~> 1.0.6)
+    daemons (1.1.8)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    eventmachine (0.12.10)
     factory_girl (2.6.4)
       activesupport (>= 2.3.9)
     factory_girl_rails (1.7.0)
@@ -126,6 +128,10 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    thin (1.3.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -154,3 +160,4 @@ DEPENDENCIES
   rspec-rails (~> 2.6)
   shoulda-matchers (~> 1.0)
   spork (~> 0.9.0.rc)
+  thin (~> 1.3)