aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-06-08 00:10:11 -0400
committerMikel Lindsaar <raasdnil@gmail.com>2010-06-08 00:10:11 -0400
commite404490f9bae102f8c7126917d59568e6d1fef79 (patch)
tree34a4fd7517026ab23498e7d2301f27ebd75cdee2 /actionpack/CHANGELOG
parent80a044edb663e6bc619b0755e30f9db10e37e9e8 (diff)
parent8d576b51a12fdb19e3993f3678ec64b2ea60fada (diff)
downloadrails-e404490f9bae102f8c7126917d59568e6d1fef79.tar.gz
rails-e404490f9bae102f8c7126917d59568e6d1fef79.tar.bz2
rails-e404490f9bae102f8c7126917d59568e6d1fef79.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index faa0d674dc..119d0bbc02 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,15 @@
*Rails 3.0.0 [beta 4/release candidate] (unreleased)*
+* Add shallow routes back to the new router [Diego Carrion]
+
+ resources :posts do
+ shallow do
+ resources :comments
+ end
+ end
+
+ You can now use comment_path for /comments/1 instead of post_comment_path for /posts/1/comments/1.
+
* Remove middleware laziness [José Valim]
* Make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean. [José Valim]