17119: Merge branch 'master' into 17119-add-filter-groups

[arvados.git] / apps / workbench / config / application.default.yml

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 9ea2cb34aafaf02c976eab8332a895175a79ba50..255ad44f852f4b567005eae0c81a8f445dfbea8b 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -53,12 +53,6 @@ development:
   action_dispatch.best_standards_support: :builtin
   assets.debug: true
   profiling_enabled: true
-  site_name: Arvados Workbench (dev)
-
-  # API server configuration
-  arvados_login_base: ~
-  arvados_v1_base: ~
-  arvados_insecure_https: ~
 
 production:
   force_ssl: true
@@ -83,20 +77,7 @@ test:
   action_mailer.delivery_method: :test
   active_support.deprecation: :stderr
   profiling_enabled: true
-  secret_token: <%= rand(2**256).to_s(36) %>
   secret_key_base: <%= rand(2**256).to_s(36) %>
-  # This setting is to allow workbench start when running tests, it should be
-  # set to a correct value when testing relevant features.
-  keep_web_url: http://example.com/c=%{uuid_or_pdh}
-
-  # When you run the Workbench's integration tests, it starts the API
-  # server as a dependency.  These settings should match the API
-  # server's Rails defaults.  If you adjust those, change these
-  # settings in application.yml to match.
-  arvados_login_base: https://localhost:3000/login
-  arvados_v1_base: https://localhost:3000/arvados/v1
-  arvados_insecure_https: true
-
   site_name: Workbench:test
 
   # Enable user profile with one required field
@@ -118,6 +99,8 @@ test:
         - IT
         - Other
 
+  repository_cache: <%= File.expand_path 'tmp/git', Rails.root %>
+
 common:
   assets.js_compressor: false
   assets.css_compressor: false