diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-28 20:32:09 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-28 20:32:09 -0700 |
| commit | c4d90e42042e66faee9ff2a32625cb250c15b4ed (patch) | |
| tree | 56a68dd53e99f130cb64d34a4ef9ba24c8a50f7d /actionpack/lib/abstract_controller | |
| parent | bbd2caeaf916980b4c55ffce2b8fd9097082f27a (diff) | |
| parent | 77088196e99bcfe0be3729c38537cf0b8fd06461 (diff) | |
| download | rails-c4d90e42042e66faee9ff2a32625cb250c15b4ed.tar.gz rails-c4d90e42042e66faee9ff2a32625cb250c15b4ed.tar.bz2 rails-c4d90e42042e66faee9ff2a32625cb250c15b4ed.zip | |
Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable
Missed commits from 3-2-stable
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. |