diff options
author | Zachary Scott <e@zzak.io> | 2014-12-22 11:11:32 -0500 |
---|---|---|
committer | Zachary Scott <e@zzak.io> | 2014-12-22 11:11:32 -0500 |
commit | 0369808917f7a67b6375aaaa34f20d773ae9b339 (patch) | |
tree | 8636b433339a737120751966e8696e3d79ba51de /guides/source/upgrading_ruby_on_rails.md | |
parent | 3cc9359c2d1158722c29504a06da1805f6766243 (diff) | |
parent | 58b7567bdab8b7422c2ef1bb0996282ac2438f7f (diff) | |
download | rails-0369808917f7a67b6375aaaa34f20d773ae9b339.tar.gz rails-0369808917f7a67b6375aaaa34f20d773ae9b339.tar.bz2 rails-0369808917f7a67b6375aaaa34f20d773ae9b339.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 51c144993c..fde69fca8d 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -1110,7 +1110,7 @@ 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_assets = true +config.serve_static_files = true config.static_cache_control = 'public, max-age=3600' ``` |