Merge branch 'master' into 11453-federated-tokens

[arvados.git] / services / api / Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 85e90e38475122f716720a04ff031f9aa6d43191..b2de3f51f2851efe374613292ef99f827032a5b3 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -198,7 +198,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)
@@ -310,7 +309,6 @@ DEPENDENCIES
   passenger
   pg
   protected_attributes
-  puma (~> 2.0)
   rails (~> 4.0)
   rails-observers
   responders (~> 2.0)