summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2015-02-06 15:44:17 -0700
committermo khan <mo@mokhan.ca>2015-02-06 15:44:17 -0700
commit21bb135528716b669e3eb0128498b79cdb3f7073 (patch)
treef63ca0f227ef32d8c6ebbe60577e33d1eac4a301
parentb89674e362b278c348de5be6c1270e640eae3a45 (diff)
add puma.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
2 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 9e937a0..67ed727 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,6 +41,7 @@ gem 'chartkick'
gem 'groupdate'
gem 'pcaprub'
gem 'packetfu'
+gem 'puma'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
diff --git a/Gemfile.lock b/Gemfile.lock
index a911f50..05d008e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,6 +104,8 @@ GEM
packetfu (1.1.10)
pcaprub (0.12.0)
pg (0.18.1)
+ puma (2.11.0)
+ rack (>= 1.1, < 2.0)
rack (1.6.0)
rack-test (0.6.3)
rack (>= 1.0)
@@ -203,6 +205,7 @@ DEPENDENCIES
packetfu
pcaprub
pg
+ puma
rails (= 4.2.0)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)