summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2015-03-18 21:19:11 -0600
committermo khan <mo@mokhan.ca>2015-03-18 21:19:11 -0600
commitfabac63e0edad3121e0875c71d1d40524236a9f2 (patch)
tree3193373aaf651e09973cce9a368b82dde658cbcb
parentc06937195b567d5651f4c6cfc8cc90f79ee93dbb (diff)
use puma in development.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
2 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 925b0127..d0f905dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,6 +71,7 @@ group :development, :test do
gem 'byebug'
gem 'web-console', '~> 2.0'
gem 'i18n-tasks'
+ gem 'puma'
end
group :production, :staging do
diff --git a/Gemfile.lock b/Gemfile.lock
index c17213ca..e4063954 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,6 +314,8 @@ GEM
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
+ puma (2.11.1)
+ rack (>= 1.1, < 2.0)
rack (1.6.0)
rack-attack (4.2.0)
rack
@@ -502,6 +504,7 @@ DEPENDENCIES
phantomjs
poltergeist
pry-rails
+ puma
rack-attack
rack-cors
rails (= 4.2.0)