15720: Merge branch 'master' into 15720-fed-user-list

[arvados.git] / services / api / config / application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index aca0669354622a29a00c11efd1b64a54b645efb4..4e1936b7716c65561d7592debbe9a3d5c5cfb51e 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -69,10 +69,6 @@ production:
 test:
   force_ssl: false
   cache_classes: true
-  public_file_server:
-    enabled: true
-    headers:
-      'Cache-Control': public, max-age=3600
   whiny_nils: true
   consider_all_requests_local: true
   action_controller.perform_caching: false
@@ -90,6 +86,5 @@ test:
   workbench_address: https://localhost:3001/
   git_repositories_dir: <%= Rails.root.join 'tmp', 'git', 'test' %>
   git_internal_dir: <%= Rails.root.join 'tmp', 'internal.git' %>
-  websocket_address: "wss://0.0.0.0:<%= ENV['ARVADOS_TEST_WSS_PORT'] %>/websocket"
   trash_sweep_interval: -1
   docker_image_formats: ["v1"]