Merge branch 'master' into 4644-collection-file-filtering

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

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 58fe3393f01ac002ff0d48e5d1712de15f33d00f..757514343fc3ea1828c8c9c797e1a97e18cb234d 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -130,6 +130,8 @@ GEM
     minitest (5.4.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
+    morrisjs-rails (0.5.1)
+      railties (> 3.1, < 5)
     multi_json (1.10.1)
     multipart-post (1.2.0)
     net-scp (1.2.1)
@@ -173,7 +175,8 @@ GEM
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.0)
+    raphael-rails (2.1.2)
     ref (1.0.5)
     ruby-debug-passenger (0.2.0)
     rubyzip (1.1.6)
@@ -252,12 +255,14 @@ DEPENDENCIES
   less-rails
   minitest (>= 5.0.0)
   mocha
+  morrisjs-rails
   multi_json
   oj
   passenger
   piwik_analytics
   poltergeist
   rails (~> 4.1.0)
+  raphael-rails
   ruby-debug-passenger
   rvm-capistrano
   sass