diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-30 15:46:05 -0300 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-30 15:48:39 -0300 |
commit | 6ee17918e1b3c76d3acbd6af5eedd1667942d56b (patch) | |
tree | e016d21ed6309ad2daba543d76b4b37d0a4aa5d5 | |
parent | 2d1eebfd88861d9eab541041a25f3f57d3cf90c7 (diff) | |
download | rails-6ee17918e1b3c76d3acbd6af5eedd1667942d56b.tar.gz rails-6ee17918e1b3c76d3acbd6af5eedd1667942d56b.tar.bz2 rails-6ee17918e1b3c76d3acbd6af5eedd1667942d56b.zip |
Improve AP changelog entry about layout method with nil return
Add a note about getting the "no layout" behavior by returning "false"
to make it easier for people that might need to change their code.
Related to #8458. [ci skip]
-rw-r--r-- | actionpack/CHANGELOG.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 586b15a62d..85f943814e 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,7 +1,7 @@ ## Rails 4.0.0 (unreleased) ## * Ensure consistent fallback to the default layout lookup for layouts set - using symbols or procs that return nil. + using symbols or procs that return `nil`. All of the following layouts will result in the default layout lookup: @@ -10,13 +10,13 @@ layout proc { nil } layout :returns_nil - def returns_nil nil end - Previously symbols and procs which returned nil resulted in no layout which - differed from the `layout nil` behavior. + Previously symbols and procs which returned `nil` resulted in no layout which + differed from the `layout nil` behavior. To get the "no layout" behavior just + return `false` instead of `nil` for `layout`. *Chris Nicola* |