[ARVADOS] updated: 1.3.0-705-g61b19018e

Git user git at public.curoverse.com
Sat Apr 6 14:29:50 UTC 2019


Summary of changes:
 services/api/config/application.default.yml            | 3 ++-
 services/api/config/environments/production.rb.example | 2 +-
 services/api/config/environments/test.rb.example       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

       via  61b19018e3bff1557d0e640ab4383d55aab9b59d (commit)
      from  0a2adc4256358d620fb063489aafbaba8de62b84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 61b19018e3bff1557d0e640ab4383d55aab9b59d
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Sat Apr 6 11:29:08 2019 -0300

    14873: Upgrades missing config settings.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index b9e4638f2..98443b428 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -551,7 +551,8 @@ production:
   cache_classes: true
   consider_all_requests_local: false
   action_controller.perform_caching: true
-  serve_static_files: false
+  public_file_server:
+    enabled: false
   assets.compress: true
   assets.compile: false
   assets.digest: true
diff --git a/services/api/config/environments/production.rb.example b/services/api/config/environments/production.rb.example
index affb31d6b..6c48dcd01 100644
--- a/services/api/config/environments/production.rb.example
+++ b/services/api/config/environments/production.rb.example
@@ -13,7 +13,7 @@ Server::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = false
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example
index 5ceb8f8b5..6b550587c 100644
--- a/services/api/config/environments/test.rb.example
+++ b/services/api/config/environments/test.rb.example
@@ -12,8 +12,8 @@ Server::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list