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 | |
| 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
| -rw-r--r-- | guides/source/configuring.md | 2 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 0c730acb60..1778620d6a 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -197,7 +197,7 @@ The full set of methods that can be used in this block are as follows: Every Rails application comes with a standard set of middleware which it uses in this order in the development environment: * `ActionDispatch::SSL` forces every request to be under HTTPS protocol. Will be available if `config.force_ssl` is set to `true`. Options passed to this can be configured by using `config.ssl_options`. -* `ActionDispatch::Static` is used to serve static assets. Disabled if `config.serve_static_assets` is `false`. +* `ActionDispatch::Static` is used to serve static assets. Disabled if `config.serve_static_files` is `false`. * `Rack::Lock` wraps the app in mutex so it can only be called by a single thread at a time. Only enabled when `config.cache_classes` is `false`. * `ActiveSupport::Cache::Strategy::LocalCache` serves as a basic memory backed cache. This cache is not thread safe and is intended only for serving as a temporary memory cache for a single thread. * `Rack::Runtime` sets an `X-Runtime` header, containing the time (in seconds) taken to execute the request. 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' ``` |