Add puma to the Gemfile for the API server; we use it for the websockets

server.

no issue #

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 105295db46c5df600b8e1eb303c237a0e59ae6e4..ce4162d86d3ad11139d179231e0f05ceba4c6bfd 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -74,3 +74,5 @@ gem 'arvados-cli', '>= 0.1.20140328152103'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
+
+gem 'puma'

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c3b518062c76c6b2b0be09a120dcc9224c1c8ee9..5f66bb2220f98db9ea3316dacd1a02351db8b2fa 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -139,6 +139,8 @@ GEM
       pg
       rails (~> 3.1)
     polyglot (0.3.4)
+    puma (2.8.2)
+      rack (>= 1.1, < 2.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -226,6 +228,7 @@ DEPENDENCIES
   passenger
   pg
   pg_power
+  puma
   rails (~> 3.2.0)
   rvm-capistrano
   sass-rails (>= 3.2.0)