From 756ebd3025fadd53276f15af34e855fda55544f9 Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Tue, 25 Jun 2013 18:18:00 +0100
Subject: [PATCH] Use unicorn instead of Thin webserver

This is in the name of eliminating unnecessary differences between
development and production. You must invoke unicorn with `unicorn`
rather than `rails s`. By default it listens on port 8080.
---
 Gemfile      | 3 +--
 Gemfile.lock | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7920050cd..6157e668a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'rails', '3.2.13'
 gem 'rack', '~>1.4.5'
 gem 'json', '~>1.7.7'
 gem 'haml'
+gem 'unicorn' # http server
 
 gem 'cancan'
 
@@ -20,7 +21,6 @@ gem 'active_utils', '1.0.5',
 group :production, :staging do
   gem 'pg'
   gem 'newrelic_rpm'
-  gem 'unicorn'
   gem 'dalli'
   gem 'memcachier'
 end
@@ -92,7 +92,6 @@ gem 'omniauth-flickr'
 gem 'rake', '>= 10.0.0'
 
 group :development, :test do
-  gem 'thin'
   gem 'sqlite3'
   gem 'haml-rails'
   gem 'rspec-rails', '~> 2.12.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index bef30dee2..d5d22729b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,6 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
-    daemons (1.1.9)
     dalli (2.6.4)
     debugger (1.5.0)
       columnize (>= 0.3.1)
@@ -96,7 +95,6 @@ GEM
       warden (~> 1.2.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.2.0)
@@ -213,10 +211,6 @@ GEM
     sqlite3 (1.3.7)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.17.0)
     tilt (1.3.6)
     treetop (1.4.12)
@@ -278,7 +272,6 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   sqlite3
   therubyracer (~> 0.10.2)
-  thin
   twitter-bootstrap-rails!
   uglifier (>= 1.0.3)
   unicorn