cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-08 07:22:38 +00:00
Code Issues Releases Wiki Activity

Revert "Trying passenger instead of puma"

Browse Source 
This reverts commit 1fa79c9dc4.
This commit is contained in:
Jacob Cody Wimer
2015-04-22 08:03:55 -04:00
parent 1fa79c9dc4
commit 3e4dca0399
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -54,7 +54,7 @@ gem 'spring', group: :development
gem 'rb-readline' gem 'rb-readline'
gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails' gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails'
gem 'jquery-ui-rails' gem 'jquery-ui-rails'
gem 'passenger' gem 'puma'

7
Gemfile.lock
View File

@@ -94,10 +94,9 @@ GEM
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
passenger (5.0.6)
rack
rake (>= 0.8.1)
pg (0.18.1) pg (0.18.1)
puma (2.11.2)
rack (>= 1.1, < 2.0)
rack (1.6.0) rack (1.6.0)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
@@ -182,8 +181,8 @@ DEPENDENCIES
jquery-rails jquery-rails
jquery-ui-rails jquery-ui-rails
mysql2 mysql2
passenger
pg pg
puma
rails (= 4.2.0) rails (= 4.2.0)
rails_12factor rails_12factor
rb-readline rb-readline

2
Procfile
View File

@@ -1,2 +1,2 @@
worker: rake jobs:work worker: rake jobs:work
web: bundle exec passenger -p $PORT web: bundle exec puma -t 5:5 -p $PORT -e $RAILS_ENV