From 7ab49acac24c89bf8353364e6cad0db649c57e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 27 Oct 2017 18:32:23 +0200 Subject: [PATCH] FIX: 'config.serve_static_files' was renamed to 'config.public_file_server.enabled' in Rails 5.1 --- config/environments/production.rb | 2 +- config/environments/profile.rb | 2 +- config/environments/test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 6489a1777e2..c6b0d6eb84b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -10,7 +10,7 @@ Discourse::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 = GlobalSetting.serve_static_assets + config.public_file_server.enabled = GlobalSetting.serve_static_assets || false config.assets.js_compressor = :uglifier diff --git a/config/environments/profile.rb b/config/environments/profile.rb index 3f672a9c472..e29421d57e2 100644 --- a/config/environments/profile.rb +++ b/config/environments/profile.rb @@ -13,7 +13,7 @@ Discourse::Application.configure do config.action_controller.perform_caching = true # in profile mode we serve static assets - config.serve_static_files = true + config.public_file_server.enabled = true # Compress JavaScripts and CSS config.assets.compress = true diff --git a/config/environments/test.rb b/config/environments/test.rb index c2129f70953..2397915f3a3 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,7 +8,7 @@ Discourse::Application.configure do config.cache_classes = true # Configure static asset server for tests with Cache-Control for performance - config.serve_static_files = true + config.public_file_server.enabled = true # Show full error reports and disable caching config.consider_all_requests_local = true