10797: Merge branch 'master' into 10797-ruby-2.3

[arvados.git] / apps / workbench / config / database.yml

diff --git a/apps/workbench/config/database.yml b/apps/workbench/config/database.yml
index 51a4dd459dc12673ad440debb28f499c89550022..39b299cbcef479a029fd249d315017e446980b42 100644 (file)
--- a/apps/workbench/config/database.yml
+++ b/apps/workbench/config/database.yml
@@ -1,25 +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
+  adapter: nulldb
+diagnostics:
+  adapter: nulldb
+performance:
+  adapter: nulldb