From 73deb3af23765882f67869afb4eaa8ad74a351d1 Mon Sep 17 00:00:00 2001
From: Justin Coyne <justin@curationexperts.com>
Date: Wed, 27 Feb 2013 09:44:25 -0600
Subject: Allow use of assert_template with the :file option. This worked in
 Rails 3.2, but was a regression in 4.0.0.beta1

---
 actionpack/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 3fc3e06160..8f7236c596 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -16,6 +16,12 @@
 
     *Yves Senn*
 
+*   Fixed regression when using `assert_template` to verify files sent using
+    `render file: 'README.md'`.
+    Fixes #9464.
+
+    *Justin Coyne*
+
 *   Skip valid encoding checks for non-String parameters that come
     from the matched route's defaults.
     Fixes #9435.
-- 
cgit v1.2.3