aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-08-09 00:02:08 +0000
committerRick Olson <technoweenie@gmail.com>2006-08-09 00:02:08 +0000
commit4679e1bf7f83b501f4a9507d530d4c707d16921f (patch)
tree36c51d11991f4d56af75709be7b49a36a039e531 /actionpack/CHANGELOG
parente9b02840708226e5cf49a75364f7e273ef8f020e (diff)
downloadrails-4679e1bf7f83b501f4a9507d530d4c707d16921f.tar.gz
rails-4679e1bf7f83b501f4a9507d530d4c707d16921f.tar.bz2
rails-4679e1bf7f83b501f4a9507d530d4c707d16921f.zip
Add RoutingError exception when RouteSet fails to generate a path from a Named Route. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4733 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 92dee9b40f..1b844f46b3 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,16 +1,15 @@
*SVN*
-<<<<<<< .mine
+* Add RoutingError exception when RouteSet fails to generate a path from a Named Route. [Rick Olson]
+
* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-=======
* Deprecation: check whether instance variables have been monkeyed with before assigning them to deprecation proxies. Raises a RuntimeError if so. [Jeremy Kemper]
* Add support for the param_name parameter to the auto_complete_field helper. #5026 [david.a.williams@gmail.com]
* Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. [Jeremy Kemper]
->>>>>>> .r4727
* 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]