aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-08-15 01:28:06 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-08-15 01:28:06 +0000
commit5baf7462c7a6dc6b30eec2b03735fee15e5b0dca (patch)
tree772db2310eeb4405a554ecb6970665fa3e73f9a5 /actionpack/CHANGELOG
parent461dce13ae6db3db60256248c1696a6d1660b0c1 (diff)
downloadrails-5baf7462c7a6dc6b30eec2b03735fee15e5b0dca.tar.gz
rails-5baf7462c7a6dc6b30eec2b03735fee15e5b0dca.tar.bz2
rails-5baf7462c7a6dc6b30eec2b03735fee15e5b0dca.zip
Add controller_paths variable to Routing; Assign Routing.controller_paths from initializer; fix script/about and rails info controller.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index fae6400849..ff636b7984 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,9 +1,12 @@
*SVN*
+* Add controller_paths variable to Routing. [Nicholas Seckar]
+
* Fix assert_redirected_to issue with named routes for module controllers. [Rick Olson]
* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]
+>>>>>>> .r4761
* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson]