Merge branch 'master' into 14965-arv-mount-py-three

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

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 753f28e0843705b2c67b0af58cab9ec17c093a4c..548da1dc049bf32a2abc886e2c451f2b5b1927ab 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/curoverse/nulldb
+  revision: d8e0073b665acdd2537c5eb15178a60f02f4b413
+  specs:
+    activerecord-nulldb-adapter (0.3.9)
+      activerecord (>= 2.0.0)
+
 GIT
   remote: https://github.com/curoverse/themes_for_rails
   revision: ddf6e592b3b6493ea0c2de7b5d3faa120ed35be0
@@ -41,8 +48,6 @@ GEM
       activemodel (= 5.0.7.2)
       activesupport (= 5.0.7.2)
       arel (~> 7.0)
-    activerecord-nulldb-adapter (0.3.9)
-      activerecord (>= 2.0.0)
     activesupport (5.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -75,8 +80,11 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    bootstrap-sass (3.1.1.1)
-      sass (~> 3.2)
+    autoprefixer-rails (9.5.1.1)
+      execjs
+    bootstrap-sass (3.4.1)
+      autoprefixer-rails (>= 5.2.1)
+      sassc (>= 2.0.0)
     bootstrap-tab-history-rails (0.1.0)
       railties (>= 3.1)
     bootstrap-x-editable-rails (1.5.1.1)
@@ -216,6 +224,10 @@ GEM
       bundler (>= 1.3.0)
       railties (= 5.0.7.2)
       sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -297,7 +309,6 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    wiselinks (1.2.1)
     xpath (2.1.0)
       nokogiri (~> 1.3)
 
@@ -306,11 +317,11 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
-  activerecord-nulldb-adapter
+  activerecord-nulldb-adapter!
   andand
   angularjs-rails (~> 1.3.8)
   arvados (>= 0.1.20150511150219)
-  bootstrap-sass (~> 3.1.0)
+  bootstrap-sass (~> 3.4.1)
   bootstrap-tab-history-rails
   bootstrap-x-editable-rails
   byebug
@@ -337,6 +348,7 @@ DEPENDENCIES
   poltergeist (~> 1.5.1)
   rack-mini-profiler
   rails (~> 5.0.0)
+  rails-controller-testing
   rails-perftest
   raphael-rails
   responders (~> 2.0)
@@ -353,7 +365,6 @@ DEPENDENCIES
   themes_for_rails!
   therubyracer
   uglifier (~> 2.0)
-  wiselinks
 
 BUNDLED WITH
    1.17.3