From ef1232c478691a5c58105435deb31cbd4c973f8b Mon Sep 17 00:00:00 2001
From: Rick Olson <technoweenie@gmail.com>
Date: Mon, 25 Dec 2006 09:35:20 +0000
Subject: [PATCH] forgot to save CHANGELOG

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5786 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 3069dff849..40b4f5b746 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting.  Closes #6128.  [Rick Olson]
+
 * Singleton resources: POST /singleton => create, GET /singleton/new => new.  [Jeremy Kemper]
 
 * Use 400 Bad Request status for unrescued ActiveRecord::RecordInvalid exceptions.  [Jeremy Kemper]