diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-02-21 17:43:49 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-02-22 09:04:04 +0100 |
| commit | a72dab0b6a16ef9e83e66c665b0f2b4364d90fb6 (patch) | |
| tree | 1c7d1432c397d9834835f164b361fd8e1be191bb /actionpack/CHANGELOG.md | |
| parent | fdcd7c0f2ee264219c322e5cb8f880ca48e14d5f (diff) | |
| download | rails-a72dab0b6a16ef9e83e66c665b0f2b4364d90fb6.tar.gz rails-a72dab0b6a16ef9e83e66c665b0f2b4364d90fb6.tar.bz2 rails-a72dab0b6a16ef9e83e66c665b0f2b4364d90fb6.zip | |
determine the match shorthand target early.
Backport #9361.
Closes #7554.
This patch determines the `controller#action` directly
in the `match` method when the shorthand syntax is used.
this prevents problems with namespaces and scopes.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 248e6f2b04..b71d004033 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,20 @@ ## unreleased ## +* Determine the controller#action from only the matched path when using the + shorthand syntax. Previously the complete path was used, which led + to problems with nesting (scopes and namespaces). + Fixes #7554. + Backport #9361. + + Example: + + # this will route to questions#new + scope ':locale' do + get 'questions/new' + end + + *Yves Senn* + * Fix `assert_template` with `render :stream => true`. Fix #1743. Backport #5288. |