Permalink
Browse files

merging

  • Loading branch information...
1 parent aad2a06 commit ccee17cb2ef835697d5a0102856b8a0f47cd8ffd @joshk joshk committed Dec 22, 2011
Showing with 10 additions and 11 deletions.
  1. +1 −1 Gemfile
  2. +8 −9 Gemfile.lock
  3. +1 −1 Procfile
View
@@ -28,7 +28,7 @@ gem 'airbrake', '~> 3.0.9'
gem 'newrelic_rpm', '~> 3.3.0'
# heroku
-gem 'puma', :git => 'git://github.com/evanphx/puma.git'
+gem 'unicorn', '~> 4.1.1'
# assets
group :assets do
View
@@ -1,13 +1,6 @@
GIT
- remote: git://github.com/evanphx/puma.git
- revision: ba27787d0ddeec09330c1cd85d20f585a66b3b8e
- specs:
- puma (0.9.2)
- rack (~> 1.2)
-
-GIT
remote: git://github.com/travis-ci/travis-core.git
- revision: 7b38d071a7ae1b80280d3a59f4451777117d0fe2
+ revision: 29988d784cb84667e1d85a31fbf2902dc79cc551
specs:
travis-core (0.0.1)
actionmailer_inline_css (~> 1.4.0)
@@ -149,6 +142,7 @@ GEM
selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0)
json (1.6.3)
+ kgio (2.7.0)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.3.0)
@@ -235,6 +229,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
+ raindrops (0.8.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
@@ -299,6 +294,10 @@ GEM
uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
+ unicorn (4.1.1)
+ kgio (~> 2.4)
+ rack
+ raindrops (~> 0.6)
unobtrusive_flash (0.0.2)
warden (1.1.0)
rack (>= 1.0)
@@ -330,7 +329,6 @@ DEPENDENCIES
newrelic_rpm (~> 3.3.0)
omniauth-github (~> 1.0.0)
pg (~> 0.11.0)
- puma!
rabl (~> 0.5.1)
rails (~> 3.1.2)
rails-dev-tweaks (~> 0.5.1)
@@ -344,6 +342,7 @@ DEPENDENCIES
travis-core!
travis-support!
uglifier (~> 1.1.0)
+ unicorn (~> 4.1.1)
unobtrusive_flash (~> 0.0.2)
webmock (~> 1.7.7)
yajl-ruby (~> 1.1.0)
View
@@ -1 +1 @@
-web: bundle exec puma config.ru -b tcp://0.0.0.0:$PORT
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

0 comments on commit ccee17c

Please sign in to comment.