From 2b1a140c9be6546d70cd44a6049d58a13c86c836 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 29 Aug 2013 15:26:27 +1000 Subject: [PATCH] add a soft puma dependency so people can run Discourse on puma --- Gemfile | 1 + Gemfile.lock | 3 +++ Gemfile_rails4.lock | 3 +++ 3 files changed, 7 insertions(+) diff --git a/Gemfile b/Gemfile index 3aed53724..85b02277d 100644 --- a/Gemfile +++ b/Gemfile @@ -196,6 +196,7 @@ gem 'redis-rack-cache', git: 'https://github.com/SamSaffron/redis-rack-cache.git gem 'rack-cache', require: false gem 'rack-cors', require: false gem 'unicorn', require: false +gem 'puma', require: false # perftools only works on 1.9 atm group :profile do diff --git a/Gemfile.lock b/Gemfile.lock index a01605169..e0988b534 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,6 +287,8 @@ GEM pry (~> 0.9.10) pry-rails (0.2.2) pry (>= 0.9.10) + puma (2.5.1) + rack (>= 1.1, < 2.0) qunit-rails (0.0.3) railties (>= 3.2.3) rack (1.4.5) @@ -501,6 +503,7 @@ DEPENDENCIES pg pry-nav pry-rails + puma qunit-rails rack-cache rack-cors diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index ebb7d5eaa..7f387e83f 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -327,6 +327,8 @@ GEM pry (~> 0.9.10) pry-rails (0.3.1) pry (>= 0.9.10) + puma (2.5.1) + rack (>= 1.1, < 2.0) qunit-rails (0.0.3) railties (>= 3.2.3) rack (1.5.2) @@ -511,6 +513,7 @@ DEPENDENCIES pg pry-nav pry-rails + puma qunit-rails rack-cache rack-cors