Merge pull request #2 from wtsi-hgi/feature/arv-view

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 49775d9652501a74ece96cb9ab54682acbd1f7ab..d671182a57c749b65bd9f7c93d2db215bc762f16 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -32,10 +32,10 @@ GEM
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.3.7)
+    addressable (2.3.8)
     andand (1.3.3)
     arel (3.0.3)
-    arvados (0.1.20150210011250)
+    arvados (0.1.20150615153458)
       activesupport (>= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       google-api-client (~> 0.6.3, >= 0.6.3)
@@ -44,7 +44,7 @@ GEM
     arvados-cli (0.1.20150205181653)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
-      arvados (~> 0.1, >= 0.1.20150128223554)
+      arvados (~> 0.1, >= 0.1.20150615153458)
       curb (~> 0.8)
       google-api-client (~> 0.6.3, >= 0.6.3)
       json (~> 1.7, >= 1.7.7)
@@ -105,7 +105,7 @@ GEM
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     jwt (0.1.13)
       multi_json (>= 1.5)
     launchy (2.4.3)
@@ -118,7 +118,7 @@ GEM
     mime-types (1.25.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    multi_json (1.11.1)
     multipart-post (1.2.0)
     net-scp (1.2.0)
       net-ssh (>= 2.6.5)
@@ -227,7 +227,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados (>= 0.1.20150210011250)
+  arvados (>= 0.1.20150615153458)
   arvados-cli (>= 0.1.20150128223752)
   coffee-rails (~> 3.2.0)
   database_cleaner