[ARVADOS] created: 1.1.0-139-ge20fbcb

[Git user]

        at  e20fbcb9eefcea9ea0b99eae0952817171bcd7a2 (commit)


commit e20fbcb9eefcea9ea0b99eae0952817171bcd7a2
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Nov 15 15:03:33 2017 -0500

    Remove puma from the API server Gemfile.
    
    refs #10767
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/services/api/Gemfile b/services/api/Gemfile
index c06a9c5..25e13a5 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -58,7 +58,6 @@ gem 'themes_for_rails', git: 'https://github.com/curoverse/themes_for_rails'
 gem 'arvados', '>= 0.1.20150615153458'
 gem 'arvados-cli', '>= 0.1.20161017193526'
 
-gem 'puma', '~> 2.0'
 gem 'sshkey'
 gem 'safe_yaml'
 gem 'lograge'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index ebb594c..91a9d04 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -197,7 +197,6 @@ GEM
     protected_attributes (1.1.3)
       activemodel (>= 4.0.1, < 5.0)
     public_suffix (2.0.5)
-    puma (2.16.0)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -308,7 +307,6 @@ DEPENDENCIES
   passenger
   pg
   protected_attributes
-  puma (~> 2.0)
   rails (~> 4.0)
   rails-observers
   responders (~> 2.0)

-----------------------------------------------------------------------


hooks/post-receive
--