Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add a soft puma dependency so people can run Discourse on puma

This commit is contained in:
Sam 2013-08-29 15:26:27 +10:00
parent eec77e7bea
commit 2b1a140c9b
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -196,6 +196,7 @@ gem 'redis-rack-cache', git: 'https://github.com/SamSaffron/redis-rack-cache.git
gem 'rack-cache', require: false gem 'rack-cache', require: false
gem 'rack-cors', require: false gem 'rack-cors', require: false
gem 'unicorn', require: false gem 'unicorn', require: false
gem 'puma', require: false
# perftools only works on 1.9 atm # perftools only works on 1.9 atm
group :profile do group :profile do

3
Gemfile.lock
View File

@ -287,6 +287,8 @@ GEM
pry (~> 0.9.10) pry (~> 0.9.10)
pry-rails (0.2.2) pry-rails (0.2.2)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (2.5.1)
rack (>= 1.1, < 2.0)
qunit-rails (0.0.3) qunit-rails (0.0.3)
railties (>= 3.2.3) railties (>= 3.2.3)
rack (1.4.5) rack (1.4.5)
@ -501,6 +503,7 @@ DEPENDENCIES
pg pg
pry-nav pry-nav
pry-rails pry-rails
puma
qunit-rails qunit-rails
rack-cache rack-cache
rack-cors rack-cors

3
Gemfile_rails4.lock
View File

@ -327,6 +327,8 @@ GEM
pry (~> 0.9.10) pry (~> 0.9.10)
pry-rails (0.3.1) pry-rails (0.3.1)
pry (>= 0.9.10) pry (>= 0.9.10)
puma (2.5.1)
rack (>= 1.1, < 2.0)
qunit-rails (0.0.3) qunit-rails (0.0.3)
railties (>= 3.2.3) railties (>= 3.2.3)
rack (1.5.2) rack (1.5.2)
@ -511,6 +513,7 @@ DEPENDENCIES
pg pg
pry-nav pry-nav
pry-rails pry-rails
puma
qunit-rails qunit-rails
rack-cache rack-cache
rack-cors rack-cors