Merge branch 'master' into 3618-column-ordering

[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 9a58b1e2c79dec792dc55ea0bf96a9828513ca5a..8d5c6160a526ee1bcd90a5f6380638c5e144c361 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -41,9 +41,9 @@ development:
   local_modified: <%= '-modified' if `git status -s` %>
 
   # API server configuration
-  arvados_login_base: https://localhost:3030/login
-  arvados_v1_base: https://localhost:3030/arvados/v1
-  arvados_insecure_https: true
+  arvados_login_base: ~
+  arvados_v1_base: ~
+  arvados_insecure_https: ~
 
 production:
   force_ssl: true
@@ -180,3 +180,6 @@ common:
 
   # 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]
+
+  # the maximum number of bytes to load in the log viewer
+  log_viewer_max_bytes: 1000000