Merge branch 'master' into 6203-collection-perf-api

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 725d40a33db653bc35eef0bd6382893162b99809..49775d9652501a74ece96cb9ab54682acbd1f7ab 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,7 +35,7 @@ GEM
     addressable (2.3.7)
     andand (1.3.3)
     arel (3.0.3)
-    arvados (0.1.20150209223754)
+    arvados (0.1.20150210011250)
       activesupport (>= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       google-api-client (~> 0.6.3, >= 0.6.3)
@@ -114,7 +114,10 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.4)
     mime-types (1.25.1)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
     multi_json (1.10.1)
     multipart-post (1.2.0)
     net-scp (1.2.0)
@@ -224,7 +227,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados (>= 0.1.20150209223754)
+  arvados (>= 0.1.20150210011250)
   arvados-cli (>= 0.1.20150128223752)
   coffee-rails (~> 3.2.0)
   database_cleaner
@@ -232,6 +235,7 @@ DEPENDENCIES
   faye-websocket
   google-api-client (~> 0.6.3)
   jquery-rails
+  mocha
   multi_json
   oj
   omniauth (= 1.1.1)