Revert "Add concurrecy with unicorn"
This reverts commit 999306ca95
.
Conflicts:
Gemfile.lock
config/unicorn.rb
This commit is contained in:
parent
dc44fa17d9
commit
698e42c025
4
Gemfile
4
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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
worker_processes 2
|
||||
timeout 60
|
Loading…
Reference in New Issue