aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-12-29 23:46:03 +0100
committerXavier Noria <fxn@hashref.com>2010-12-29 23:46:03 +0100
commit69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2 (patch)
treecbff92b476133e56dfdc4cfbdf2f5ecb6cfca2c3 /actionpack/CHANGELOG
parent0ac66caac5581c4793d120c8ad4a2cf4137f6ce2 (diff)
parent6f58b9ad5331d3619fc68a4706d5f85a95510a63 (diff)
downloadrails-69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2.tar.gz
rails-69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2.tar.bz2
rails-69765aad8bcc853e7ab6b0e79f4edece2cdd7fe2.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 20b19909fc..78fadce6cb 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -47,9 +47,7 @@
* Symbols and strings in routes should yield the same behavior. Note this may break existing apps that were using symbols with the new routes API. [José Valim]
-* Add clear_helpers as a way to clean up all helpers added to this controller, maintaing just the helper with the same name as the controller. [José Valim]
-
-* See http://github.com/rails/rails/compare/v3.0.0_RC...v3.0.0_RC2 for gory details
+* Add clear_helpers as a way to clean up all helpers added to this controller, maintaining just the helper with the same name as the controller. [José Valim]
* Support routing constraints in functional tests. [Andrew White]