From 698e42c0254fa10880e7054d884e8381c77a8ead Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Thu, 23 Jun 2011 20:36:37 -0700
Subject: [PATCH] Revert "Add concurrecy with unicorn"

This reverts commit 999306ca95bd254d3ff6db11c2cbd6401f0b191b.

Conflicts:

	Gemfile.lock
	config/unicorn.rb
---
 Gemfile           | 4 ----
 Gemfile.lock      | 7 +------
 Procfile          | 1 -
 config/unicorn.rb | 2 --
 4 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 Procfile
 delete mode 100644 config/unicorn.rb

diff --git a/Gemfile b/Gemfile
index 1b5fb01..dbfeb25 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,10 +17,6 @@ group :development, :production do
   gem 'pg'
 end
 
-group :production do
-  gem 'unicorn'
-end
-
 group :test do
   gem 'ZenTest'
   gem 'simplecov'
diff --git a/Gemfile.lock b/Gemfile.lock
index df12dcf..d63fdee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,7 +57,6 @@ GEM
     i18n (0.6.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    kgio (2.5.0)
     libv8 (3.3.10.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
@@ -98,7 +97,7 @@ GEM
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
     sprockets (2.0.0.beta.10)
-      hike (~> 1.1)
+      hike (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.3)
@@ -115,9 +114,6 @@ GEM
     uglifier (1.0.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    unicorn (3.7.0)
-      kgio (~> 2.3)
-      rack
     warden (1.0.4)
       rack (>= 1.0)
     webmock (1.6.4)
@@ -143,5 +139,4 @@ DEPENDENCIES
   therubyrhino
   turn
   uglifier
-  unicorn
   webmock
diff --git a/Procfile b/Procfile
deleted file mode 100644
index 9c82374..0000000
--- a/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
diff --git a/config/unicorn.rb b/config/unicorn.rb
deleted file mode 100644
index 3cd00d5..0000000
--- a/config/unicorn.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-worker_processes 2
-timeout 60