aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-08-05 22:12:50 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-08-05 22:12:50 +0000
commit127ee8c8f8103515929f31cf24fdc3d9b68d692d (patch)
tree796e057666e4a0f8dc51bb7a6bfefdc9f195aa5c /actionpack/CHANGELOG
parent900afae41b00b27c6f1fc53044fe4ca917f09c81 (diff)
downloadrails-127ee8c8f8103515929f31cf24fdc3d9b68d692d.tar.gz
rails-127ee8c8f8103515929f31cf24fdc3d9b68d692d.tar.bz2
rails-127ee8c8f8103515929f31cf24fdc3d9b68d692d.zip
Make Routing noisy when an anchor regexp is assigned to a segment. Closes #5674
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4677 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 4bcc860e09..3f738c32bc 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,10 @@
*SVN*
+* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [francois.beausoleil@gmail.com]
+
* Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
+>>>>>>> .r4676
* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
* Make controller_path available as an instance method. #5724 [jmckible@gmail.com]