Merge branch 'master' into 5735-edit-description-box-size

[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 ab81032e23f3ebb29129f0dd3a8ca15997899285..4061ee83d89ae83a0ef363e1e43571326ca870e6 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -120,7 +120,6 @@ test:
         - Software developer
         - IT
         - Other
-  anonymous_user_token: 4kg6k6lzmp9kj4cpkcoxie964cmvjahbt4fod9zru44k4jqdmi
 
 common:
   assets.js_compressor: false
@@ -132,6 +131,7 @@ common:
   arvados_insecure_https: true
   activation_contact_link: mailto:info@arvados.org
   arvados_docsite: http://doc.arvados.org
+  arvados_public_data_doc_url: http://arvados.org/projects/arvados/wiki/Public_Pipelines_and_Datasets
   arvados_theme: default
   show_user_agreement_inline: false
   secret_token: ~
@@ -139,8 +139,14 @@ common:
   default_openid_prefix: https://www.google.com/accounts/o8/id
   send_user_setup_notification_email: true
 
-  # Set user_profile_form_fields to enable and configure the user profile page.
-  # Default is set to false. A commented setting with full description is provided below.
+  # Scratch directory used by the remote repository browsing
+  # feature. If it doesn't exist, it (and any missing parents) will be
+  # created using mkdir_p.
+  repository_cache: <%= File.expand_path 'tmp/git', Rails.root %>
+
+  # Set user_profile_form_fields to enable and configure the user
+  # profile page. Default is set to false. A commented example with
+  # full description is provided below.
   user_profile_form_fields: false
 
   # Below is a sample setting of user_profile_form_fields config parameter.
@@ -186,13 +192,22 @@ common:
   issue_reporter_email_to: arvados@example.com
   support_email_address: arvados@example.com
 
-  # filename suffixes for which view icon would be shown in collection show page
-  filename_suffixes_with_view_icon: [txt, gif, jpeg, jpg, png, html, htm, pdf]
+  # generic issue email from
+  email_from: arvados@example.com
+
+  # Mimetypes of applications for which the view icon
+  # 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: [fasta, go, javascript, json, pdf, python, r, rtf, sam, sh, xml, xsl]
 
   # the maximum number of bytes to load in the log viewer
   log_viewer_max_bytes: 1000000
 
-  # Set anonymous user token to enable anonymous user access. You can get
+  # Set anonymous_user_token to enable anonymous user access. You can get
   # the token by running "bundle exec ./script/get_anonymous_user_token.rb"
-  # in the directory where you API server is running.
+  # in the directory where your API server is running.
   anonymous_user_token: false
+
+  # Enable response payload compression in Arvados API requests.
+  include_accept_encoding_header_in_api_requests: true