diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-07 08:00:45 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-07 08:00:45 -0800 |
| commit | 0df2ef3ef4db161524d0d5eb275e41032b60db00 (patch) | |
| tree | 24462bce4ec413cf4288f7d3b0bc108818064095 /actionpack/CHANGELOG.md | |
| parent | 4f107384f02b1f122330d3e589a92a8fdd078e2e (diff) | |
| parent | 18ceed201b37d91ad6598d0f8b3c010e6cc48b15 (diff) | |
| download | rails-0df2ef3ef4db161524d0d5eb275e41032b60db00.tar.gz rails-0df2ef3ef4db161524d0d5eb275e41032b60db00.tar.bz2 rails-0df2ef3ef4db161524d0d5eb275e41032b60db00.zip | |
Merge pull request #3884 from sikachu/master-fix_layout
Allow layout fallback when using `layout` method
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 6d62d5eeec..8844d6e6f6 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,15 @@ ## Rails 3.2.0 (unreleased) ## +* Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. *Prem Sichanugrist* + + For example, consider this snippet: + + class CarsController + layout 'single_car', :only => :show + end + + Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions. + * form_for with +:as+ option uses "#{action}_#{as}" as css class and id: Before: |