From bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0 Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Tue, 22 Nov 2005 08:37:04 +0000
Subject: 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
---
 actionpack/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/CHANGELOG')

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]
-- 
cgit v1.2.3