Merge branch 'master' into 9998-unsigned_manifest

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index d9edcc64fa4ee48e455e4ad17dff6ac3821b5172..9c9c4ae9e58b3105c47aa5eb330e052b3747a19f 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -42,7 +42,7 @@ GEM
       i18n (~> 0)
       json (~> 1.7, >= 1.7.7)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (0.1.20160913140509)
+    arvados-cli (0.1.20161017193526)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.20150128223554)
@@ -132,13 +132,6 @@ GEM
     memoist (0.15.0)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    minitest (4.7.5)
-    minitest-rails (1.0.1)
-      minitest (~> 4.7)
-      minitest-test (~> 1.0)
-      railties (>= 3.0, < 4.1)
-    minitest-test (1.1.0)
-      minitest (~> 4.0)
     mocha (1.2.0)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
@@ -258,7 +251,7 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20150615153458)
-  arvados-cli (>= 0.1.20151207150126)
+  arvados-cli (>= 0.1.20161017193526)
   coffee-rails (~> 3.2)
   database_cleaner
   factory_girl_rails
@@ -266,8 +259,6 @@ DEPENDENCIES
   jquery-rails
   lograge
   logstash-event
-  minitest (~> 4.0)
-  minitest-rails
   mocha
   multi_json
   oj
@@ -293,4 +284,4 @@ DEPENDENCIES
   uglifier (~> 2.0)
 
 BUNDLED WITH
-   1.13.2
+   1.13.6