diff options
| author | Sam Stephenson <sam@37signals.com> | 2005-11-22 08:37:04 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2005-11-22 08:37:04 +0000 |
| commit | bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0 (patch) | |
| tree | 4c7f1d9df0b5db914648cf5742a7f953c60433e5 /actionpack/CHANGELOG | |
| parent | 130c493a4ff295723fa08935c71b89badef06cdc (diff) | |
| download | rails-bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0.tar.gz rails-bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0.tar.bz2 rails-bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0.zip | |
Make ActionController's render honor the :locals option when rendering a :file. Closes #1665.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index db41b582cc..a4a7a605c8 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make ActionController's render honor the :locals option when rendering a :file. #1665. [Emanuel Borsboom, Marcel Molina Jr.] + * Allow assert_tag(:conditions) to match the empty string when a tag has no children. Closes #2959. [Jamis Buck] * Update html-scanner to handle CDATA sections better. Closes #2970. [Jamis Buck] |