aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
Diffstat (limited to 'guides')
-rw-r--r--guides/source/configuring.md24
-rw-r--r--guides/source/upgrading_ruby_on_rails.md24
2 files changed, 28 insertions, 20 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 3aa21b7772..7239105b29 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -402,6 +402,22 @@ The schema dumper adds one additional configuration option:
* `config.action_controller.always_permitted_parameters` sets a list of whitelisted parameters that are permitted by default. The default values are `['controller', 'action']`.
+* `config.action_controller.enable_fragment_cache_logging` determines whether to log fragment cache reads and writes in verbose format as follows:
+
+ ```
+ Read fragment views/v1/2914079/v1/2914079/recordings/70182313-20160225015037000000/d0bdf2974e1ef6d31685c3b392ad0b74 (0.6ms)
+ Rendered messages/_message.html.erb in 1.2 ms [cache hit]
+ Write fragment views/v1/2914079/v1/2914079/recordings/70182313-20160225015037000000/3b4e249ac9d168c617e32e84b99218b5 (1.1ms)
+ Rendered recordings/threads/_thread.html.erb in 1.5 ms [cache miss]
+ ```
+
+ By default it is set to `false` which results in following output:
+
+ ```
+ Rendered messages/_message.html.erb in 1.2 ms [cache hit]
+ Rendered recordings/threads/_thread.html.erb in 1.5 ms [cache miss]
+ ```
+
### Configuring Action Dispatch
* `config.action_dispatch.session_store` sets the name of the store for session data. The default is `:cookie_store`; other valid options include `:active_record_store`, `:mem_cache_store` or the name of your own custom class.
@@ -518,14 +534,6 @@ encrypted cookies salt value. Defaults to `'signed encrypted cookie'`.
* `config.action_view.debug_missing_translation` determines whether to wrap the missing translations key in a `<span>` tag or not. This defaults to `true`.
-* `config.action_view.enable_fragment_cache_logging` determines whether to log fragment cache reads and writes like:
-
- ```
- Read fragment views/v1/2914079/v1/2914079/recordings/70182313-20160225015037000000/d0bdf2974e1ef6d31685c3b392ad0b74 (0.6ms)
- ```
-
- Default value is false.
-
### Configuring Action Mailer
There are a number of settings available on `config.action_mailer`:
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 2ac5a2188b..e3b0f42a95 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -147,18 +147,18 @@ documentation.
### Autoloading is Disabled After Booting in the Production Environment
-Autoloading is now disabled after booting in the production environment by
-default.
-
-Eager loading the application is part of the boot process, so top-level
-constants are fine and are still autoloaded, no need to require their files.
-
-Constants in deeper places only executed at runtime, like regular method bodies,
-are also fine because the file defining them will have been eager loaded while booting.
-
-For the vast majority of applications this change needs no action. But in the
-very rare event that your application needs autoloading while running in
-production mode, set `Rails.application.config.enable_dependency_loading` to
+Autoloading of paths in `config.autoload_paths` is now disabled after booting in
+the production environment by default. Eager loading the application is part of
+the boot process. Top-level constants should still work as they are still
+autoloaded, meaning you don't need to manually require them.
+
+Constants in deeper places are only executed at runtime, like regular method
+bodies. These should also still work because their Ruby definition files will be
+eager loaded during the boot process as well.
+
+For the vast majority of applications this change requires no action. But in the
+rare situation where your application needs autoloading in the production
+environment, you can set `Rails.application.config.enable_dependency_loading` to
true.
### XML Serialization