aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/upgrading_ruby_on_rails.md
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-11-04 22:37:39 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-11-04 22:40:58 +0100
commitb7f547e64aea0edaf3ebfb936e3bbfbb9f3e7a24 (patch)
treea4aaa56ae2b50d5ff84d6bfa1fda255fd970d472 /guides/source/upgrading_ruby_on_rails.md
parentfa2c96b3f7332367d509e32127f04c4c2d7632fe (diff)
downloadrails-b7f547e64aea0edaf3ebfb936e3bbfbb9f3e7a24.tar.gz
rails-b7f547e64aea0edaf3ebfb936e3bbfbb9f3e7a24.tar.bz2
rails-b7f547e64aea0edaf3ebfb936e3bbfbb9f3e7a24.zip
Replace `serve_static_files` mentions in docs.
Should use `public_file_server.enabled` instead. Clarified that static files will be served from the public directory, where it made sense. Also removed occurrence of the deprecated `static_cache_control`.
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 1fe95c3422..fa6a01671b 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -1191,8 +1191,10 @@ You can help test performance with these additions to your test environment:
```ruby
# 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'
+}
```
### config/initializers/wrap_parameters.rb