[ARVADOS] updated: 040fdf6da00318b5b8e8e83eceeec783680ecb1c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  3 +-
 apps/workbench/Gemfile.lock                        |  5 +--
 apps/workbench/config/database.yml                 | 40 ++++------------------
 .../install-workbench-app.html.textile.liquid      |  2 +-
 4 files changed, 11 insertions(+), 39 deletions(-)

       via  040fdf6da00318b5b8e8e83eceeec783680ecb1c (commit)
       via  41068df20f2a9fe9dbb3e29e55af0c82832359ad (commit)
      from  8464bb48ba769c8bf0984c8b1493ca43fd902891 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 040fdf6da00318b5b8e8e83eceeec783680ecb1c
Merge: 8464bb4 41068df
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Apr 28 02:10:14 2015 -0400

    Merge branch '5739-no-sqlite3' closes #5739


commit 41068df20f2a9fe9dbb3e29e55af0c82832359ad
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Apr 15 14:26:33 2015 -0400

    5739: Remove unnecessary sqlite3 dependency.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 9e0eef8..3c925f9 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.1.0'
 gem 'arvados', '>= 0.1.20150421171838'
 
-gem 'sqlite3'
-
+gem 'activerecord-nulldb-adapter'
 gem 'multi_json'
 gem 'oj'
 gem 'sass'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index df10d71..9311bfa 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -30,6 +30,8 @@ GEM
       activemodel (= 4.1.9)
       activesupport (= 4.1.9)
       arel (~> 5.0.0)
+    activerecord-nulldb-adapter (0.3.1)
+      activerecord (>= 2.0.0)
     activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
@@ -229,7 +231,6 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
     sshkey (1.6.1)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
@@ -256,6 +257,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
+  activerecord-nulldb-adapter
   andand
   angularjs-rails
   arvados (>= 0.1.20150421171838)
@@ -292,7 +294,6 @@ DEPENDENCIES
   selenium-webdriver
   simplecov (~> 0.7)
   simplecov-rcov
-  sqlite3
   sshkey
   themes_for_rails!
   therubyracer
diff --git a/apps/workbench/config/database.yml b/apps/workbench/config/database.yml
index 34a3224..39b299c 100644
--- a/apps/workbench/config/database.yml
+++ b/apps/workbench/config/database.yml
@@ -1,39 +1,11 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Note: The database configuration is not actually used.
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
+  adapter: nulldb
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
+  adapter: nulldb
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Note: The "diagnostics" database configuration is not actually used.
+  adapter: nulldb
 diagnostics:
-  adapter: sqlite3
-  database: db/diagnostics.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Note: The "performance" database configuration is not actually used.
+  adapter: nulldb
 performance:
-  adapter: sqlite3
-  database: db/diagnostics.sqlite3
-  pool: 5
-  timeout: 5000
+  adapter: nulldb
diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index 06e320e..4131849 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -12,7 +12,7 @@ h2. Install prerequisites
 <pre><code>~$ <span class="userinput">sudo apt-get install \
     bison build-essential gettext libcurl3 libcurl3-gnutls \
     libcurl4-openssl-dev libpcre3-dev libpq-dev libreadline-dev \
-    libssl-dev libxslt1.1 git wget zlib1g-dev graphviz libsqlite3-dev
+    libssl-dev libxslt1.1 git wget zlib1g-dev graphviz
 </span></code></pre></notextile>
 
 Also make sure you have "Ruby and bundler":install-manual-prerequisites-ruby.html installed.

-----------------------------------------------------------------------


hooks/post-receive
--