Merge branch 'master' into 14259-pysdk-remote-block-copy

[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 eda6d0a423203dcec81a876352ad709766bcb28d..4e0a35a5550360252cae77e49e22ac1d7dec370f 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -66,12 +66,13 @@ production:
   eager_load: true
   consider_all_requests_local: false
   action_controller.perform_caching: true
-  serve_static_assets: false
+  serve_static_files: false
   assets.compile: false
   assets.digest: true
   i18n.fallbacks: true
   active_support.deprecation: :notify
   profiling_enabled: false
+  log_level: info
 
   arvados_insecure_https: false
 
@@ -88,7 +89,7 @@ production:
 test:
   cache_classes: true
   eager_load: false
-  serve_static_assets: true
+  serve_static_files: true
   static_cache_control: public, max-age=3600
   consider_all_requests_local: true
   action_controller.perform_caching: false
@@ -200,6 +201,11 @@ common:
   # "git log".
   source_version: false
 
+  # Override the automatic package string. With the default value of
+  # false, the package string is read from package-build.version in
+  # Rails.root (included in vendor packages).
+  package_version: false
+
   # report notification to and from addresses
   issue_reporter_email_from: arvados@example.com
   issue_reporter_email_to: arvados@example.com
@@ -212,7 +218,7 @@ common:
   # would be enabled in a collection's show page.
   # It is sufficient to list only applications here.
   # No need to list text and image types.
-  application_mimetypes_with_view_icon: [cwl, fasta, go, javascript, json, pdf, python, r, rtf, sam, sh, vnd.realvnc.bed, xml, xsl]
+  application_mimetypes_with_view_icon: [cwl, fasta, go, javascript, json, pdf, python, r, rtf, sam, x-sh, vnd.realvnc.bed, xml, xsl]
 
   # the maximum number of bytes to load in the log viewer
   log_viewer_max_bytes: 1000000
@@ -309,3 +315,14 @@ common:
   # Example:
   # multi_site_search: https://workbench.qr1hi.arvadosapi.com/collections/multisite
   multi_site_search: false
+
+  #
+  # Link to use for Arvados Workflow Composer app, or false if not available.
+  #
+  composer_url: false
+
+  #
+  # Should workbench allow management of local git repositories? Set to false if
+  # the jobs api is disabled and there are no local git repositories.
+  #
+  repositories: true