Merge branch 'master' into 3661-copy-move-from-show

[arvados.git] / apps / workbench / Gemfile.lock

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 173be13cc3e312a64d8a10a5e183cb81f72957bf..bdf39138819841d4cded1766eb49f70500c56599 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -36,8 +36,19 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    addressable (2.3.6)
     andand (1.3.3)
     arel (5.0.1.20140414130214)
+    arvados (0.1.20140917180103)
+      activesupport (>= 3.2.13)
+      andand
+      google-api-client (~> 0.6.3)
+      json (>= 1.7.7)
+      jwt (>= 0.1.5, < 1.0.0)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
     bootstrap-sass (3.1.0.1)
       sass (~> 3.2)
     bootstrap-x-editable-rails (1.5.1.1)
@@ -70,7 +81,20 @@ GEM
     deep_merge (1.0.1)
     erubis (2.7.0)
     execjs (2.0.2)
+    extlib (0.9.16)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
     ffi (1.9.3)
+    google-api-client (0.6.4)
+      addressable (>= 2.3.2)
+      autoparse (>= 0.3.3)
+      extlib (>= 0.9.15)
+      faraday (~> 0.8.4)
+      jwt (>= 0.1.5)
+      launchy (>= 2.1.1)
+      multi_json (>= 1.0.0)
+      signet (~> 0.4.5)
+      uuidtools (>= 2.1.0)
     headless (1.0.1)
     highline (1.6.20)
     hike (1.2.3)
@@ -80,6 +104,10 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    jwt (0.1.13)
+      multi_json (>= 1.5)
+    launchy (2.4.2)
+      addressable (~> 2.3)
     less (2.4.0)
       commonjs (~> 0.2.7)
     less-rails (2.4.2)
@@ -93,6 +121,7 @@ GEM
     mini_portile (0.5.2)
     minitest (5.3.3)
     multi_json (1.10.0)
+    multipart-post (1.2.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -151,6 +180,11 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
+    signet (0.4.5)
+      addressable (>= 2.2.3)
+      faraday (~> 0.8.1)
+      jwt (>= 0.1.5)
+      multi_json (>= 1.0.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -167,6 +201,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.8)
+    sshkey (1.6.1)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
@@ -181,8 +216,10 @@ GEM
     uglifier (2.3.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    uuidtools (2.1.5)
     websocket (1.0.7)
     websocket-driver (0.3.2)
+    wiselinks (1.2.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -192,6 +229,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   andand
+  arvados (>= 0.1.20140917180103)
   bootstrap-sass (~> 3.1.0)
   bootstrap-x-editable-rails
   capybara
@@ -216,6 +254,8 @@ DEPENDENCIES
   simplecov (~> 0.7.1)
   simplecov-rcov
   sqlite3
+  sshkey
   themes_for_rails!
   therubyracer
   uglifier (>= 1.0.3)
+  wiselinks