Browse files

Replace thin with puma

  • Loading branch information...
1 parent ed4499b commit d16ed7240ffd4d7d825f5d5ac66d907247bd941f @sferik committed Apr 22, 2012
Showing with 5 additions and 9 deletions.
  1. +1 −1 Gemfile
  2. +3 −7 Gemfile.lock
  3. +1 −1 Procfile
View
2 Gemfile
@@ -14,7 +14,7 @@ group :assets do
end
group :production do
- gem 'thin'
+ gem 'puma'
end
group :test do
View
10 Gemfile.lock
@@ -32,9 +32,7 @@ GEM
arel (3.0.2)
builder (3.0.0)
crack (0.3.1)
- daemons (1.1.8)
erubis (2.7.0)
- eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
faraday (0.7.6)
@@ -68,6 +66,8 @@ GEM
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
polyglot (0.3.3)
+ puma (1.2.1)
+ rack (~> 1.2)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -107,10 +107,6 @@ 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)
@@ -139,10 +135,10 @@ DEPENDENCIES
mocha
omniauth
omniauth-twitter
+ puma
rails (~> 3.2)
sass-rails
simplecov
- thin
twitter
twitter-text
uglifier
View
2 Procfile
@@ -1 +1 @@
-web: bundle exec rails server thin -p $PORT
+web: bundle exec puma -p $PORT

0 comments on commit d16ed72

Please sign in to comment.