diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-20 14:56:18 +0100 |
|---|---|---|
| committer | Alexey Vakhov <vakhov@gmail.com> | 2012-03-28 23:06:52 +0400 |
| commit | dd0275e46314b6c4cddb1ae438ce1390d13aa53c (patch) | |
| tree | 8532cceb789428c9caf4f7989a8491a79f027ed8 /actionpack/lib/abstract_controller | |
| parent | c82fd8fc2ac9f8273825fc272a0bf17e5c583d71 (diff) | |
| download | rails-dd0275e46314b6c4cddb1ae438ce1390d13aa53c.tar.gz rails-dd0275e46314b6c4cddb1ae438ce1390d13aa53c.tar.bz2 rails-dd0275e46314b6c4cddb1ae438ce1390d13aa53c.zip | |
Add a test case for layout nil.
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 6f13ebe0d0..bc9f6fc3e8 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -249,6 +249,7 @@ module AbstractController # Symbol:: call the method specified by the symbol, which will return the template name # false:: There is no layout # true:: raise an ArgumentError + # nil:: Force default layout behavior with inheritance # # ==== Parameters # * <tt>layout</tt> - The layout to use. |