Merge branch 'master' into 3400-workbench-all-items

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

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 7d98bf108b407c7f9700159461d6c41834c8023b..53d42cb856e59903704b39e157bb118de6c4320f 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
     addressable (2.3.6)
     andand (1.3.3)
     arel (5.0.1.20140414130214)
-    arvados (0.1.20140910123800)
+    arvados (0.1.20140917180103)
       activesupport (>= 3.2.13)
       andand
       google-api-client (~> 0.6.3)
@@ -51,16 +51,22 @@ GEM
       multi_json (>= 1.0.0)
     bootstrap-sass (3.1.0.1)
       sass (~> 3.2)
+    bootstrap-tab-history-rails (0.1.0)
+      railties (>= 3.1)
     bootstrap-x-editable-rails (1.5.1.1)
       railties (>= 3.0)
     builder (3.2.2)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capybara (2.2.1)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -76,8 +82,10 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
+    columnize (0.8.9)
     commonjs (0.2.7)
     daemon_controller (1.1.7)
+    debugger-linecache (1.2.0)
     deep_merge (1.0.1)
     erubis (2.7.0)
     execjs (2.0.2)
@@ -98,7 +106,7 @@ GEM
     headless (1.0.1)
     highline (1.6.20)
     hike (1.2.3)
-    httpclient (2.3.4.1)
+    httpclient (2.5.0)
     i18n (0.6.9)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
@@ -117,9 +125,12 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.6.0)
     minitest (5.3.3)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
     multi_json (1.10.0)
     multipart-post (1.2.0)
     net-scp (1.1.2)
@@ -129,8 +140,8 @@ GEM
     net-ssh (2.7.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
     oj (2.1.7)
     passenger (4.0.23)
       daemon_controller (>= 1.1.0)
@@ -166,6 +177,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.3.1)
     ref (1.0.5)
+    ruby-debug-passenger (0.2.0)
     rubyzip (1.1.0)
     rvm-capistrano (1.5.1)
       capistrano (~> 2.15.4)
@@ -191,6 +203,7 @@ GEM
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
+    slop (3.6.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -229,24 +242,28 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   andand
-  arvados (>= 0.1.20140910123800)
+  arvados (>= 0.1.20140917180103)
   bootstrap-sass (~> 3.1.0)
+  bootstrap-tab-history-rails
   bootstrap-x-editable-rails
+  byebug
   capybara
   coffee-rails
   deep_merge
   headless
-  httpclient
+  httpclient (~> 2.5.0)
   jquery-rails
   less
   less-rails
   minitest (>= 5.0.0)
+  mocha
   multi_json
   oj
   passenger
   piwik_analytics
   poltergeist
   rails (~> 4.1.0)
+  ruby-debug-passenger
   rvm-capistrano
   sass
   sass-rails