Merge branch 'master' into 3177-collection-choose-files

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

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 70ef7a0f101abff207922b23bdbf97b22c86948c..53d42cb856e59903704b39e157bb118de6c4320f 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
       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)
@@ -127,7 +127,7 @@ GEM
       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)
@@ -140,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)