aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-09-20 17:45:03 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-09-20 17:45:03 +0000
commit4ae3db83663ad2f12d732da333c664a6452df674 (patch)
tree1649780c3a9f4c0089fd56462b45b8a84fcc3ad9 /actionpack/CHANGELOG
parent54c393f5fa2dfd5ff5866cba74e7179f493732df (diff)
downloadrails-4ae3db83663ad2f12d732da333c664a6452df674.tar.gz
rails-4ae3db83663ad2f12d732da333c664a6452df674.tar.bz2
rails-4ae3db83663ad2f12d732da333c664a6452df674.zip
Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5151 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 765ef51029..eb4c5f4088 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. [Nicholas Seckar]
+
* Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability. #3368, #6226 [sdsykes, fhanshaw@vesaria.com]
* Added that respond_to blocks will automatically set the content type to be the same as is requested [DHH]. Examples: