aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2019-04-23 13:46:58 -0400
committerGitHub <noreply@github.com>2019-04-23 13:46:58 -0400
commitdf35204ed190086ec95b308ac1764571344005a6 (patch)
treec0ca186979bdf1fa219a27d6821755099514fd32
parentfc35da76e93f8a5d5ace595b4819e19cc0512edd (diff)
parentc30344eb6e102ef916eef7857d51a8bf6423bd62 (diff)
downloadrails-df35204ed190086ec95b308ac1764571344005a6.tar.gz
rails-df35204ed190086ec95b308ac1764571344005a6.tar.bz2
rails-df35204ed190086ec95b308ac1764571344005a6.zip
Merge pull request #36066 from st0012/update-controller-cache-doc
Update document about perform_caching's default value [ci skip]
-rw-r--r--guides/source/configuring.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index c315599fb0..42da654fe7 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -409,7 +409,7 @@ The schema dumper adds two additional configuration options:
* `config.action_controller.asset_host` sets the host for the assets. Useful when CDNs are used for hosting assets rather than the application server itself.
-* `config.action_controller.perform_caching` configures whether the application should perform the caching features provided by the Action Controller component or not. Set to `false` in development mode, `true` in production.
+* `config.action_controller.perform_caching` configures whether the application should perform the caching features provided by the Action Controller component or not. Set to `false` in development mode, `true` in production. If it's not specified, the default will be `true`.
* `config.action_controller.default_static_extension` configures the extension used for cached pages. Defaults to `.html`.
@@ -696,7 +696,7 @@ There are a number of settings available on `config.action_mailer`:
* `config.action_mailer.deliver_later_queue_name` specifies the queue name for
mailers. By default this is `mailers`.
-* `config.action_mailer.perform_caching` specifies whether the mailer templates should perform fragment caching or not. By default this is `false` in all environments.
+* `config.action_mailer.perform_caching` specifies whether the mailer templates should perform fragment caching or not. If it's not specified, the default will be `true`.
* `config.action_mailer.delivery_job` specifies delivery job for mail. Defaults to `ActionMailer::DeliveryJob`.