Replace thin with puma

This commit is contained in:
Erik Michaels-Ober 2012-04-22 16:23:18 -07:00
parent 84f8ee9394
commit 52d9a1b609
3 changed files with 5 additions and 9 deletions

View File

@ -21,7 +21,7 @@ group :assets do
end end
group :production do group :production do
gem 'thin' gem 'puma'
end end
group :test do group :test do

View File

@ -42,14 +42,12 @@ GEM
execjs execjs
coffee-script-source (1.3.1) coffee-script-source (1.3.1)
crack (0.3.1) crack (0.3.1)
daemons (1.1.8)
devise (2.0.4) devise (2.0.4)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3) orm_adapter (~> 0.0.3)
railties (~> 3.1) railties (~> 3.1)
warden (~> 1.1.1) warden (~> 1.1.1)
erubis (2.7.0) erubis (2.7.0)
eventmachine (0.12.10)
execjs (1.3.0) execjs (1.3.0)
multi_json (~> 1.0) multi_json (~> 1.0)
fastercsv (1.5.4) fastercsv (1.5.4)
@ -81,6 +79,8 @@ GEM
orm_adapter (0.0.7) orm_adapter (0.0.7)
pg (0.13.2) pg (0.13.2)
polyglot (0.3.3) polyglot (0.3.3)
puma (1.2.1)
rack (~> 1.2)
rack (1.4.1) rack (1.4.1)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
@ -137,10 +137,6 @@ GEM
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6) sqlite3 (1.3.6)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6) thor (0.14.6)
tilt (1.3.3) tilt (1.3.3)
treetop (1.4.10) treetop (1.4.10)
@ -169,12 +165,12 @@ DEPENDENCIES
haml (~> 3.2.0.alpha) haml (~> 3.2.0.alpha)
http_accept_language http_accept_language
pg pg
puma
rails (~> 3.2) rails (~> 3.2)
rails_admin rails_admin
sass-rails sass-rails
simplecov simplecov
sqlite3 sqlite3
thin
uglifier uglifier
validates_formatting_of validates_formatting_of
webmock webmock

View File

@ -1 +1 @@
web: bundle exec rails server thin -p $PORT web: bundle exec puma -p $PORT