Merge branch '11908-properties-column-json'

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index ebb594cb1ef31c8b89bd79a0dd01d2b14c158e56..b2de3f51f2851efe374613292ef99f827032a5b3 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -127,6 +127,7 @@ GEM
     hashie (3.5.5)
     highline (1.7.8)
     hike (1.2.3)
+    httpclient (2.8.3)
     i18n (0.9.0)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.2.2)
@@ -197,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)
@@ -296,6 +296,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl_rails
   faye-websocket
+  httpclient
   jquery-rails
   lograge
   logstash-event
@@ -308,7 +309,6 @@ DEPENDENCIES
   passenger
   pg
   protected_attributes
-  puma (~> 2.0)
   rails (~> 4.0)
   rails-observers
   responders (~> 2.0)