From c88ee76928a85cc34318d0442b38da4c850b7030 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 21 Feb 2013 17:43:49 +0100
Subject: determine the match shorthand target early.

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.
---
 actionpack/CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 1a0060c911..c9d3b1c55c 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,19 @@
 ## Rails 4.0.0 (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.
+
+    Example:
+
+        # this will route to questions#new
+        scope ':locale' do
+          get 'questions/new'
+        end
+
+    *Yves Senn*
+
 *   Remove support for parsing XML parameters from request. If you still want to parse XML
     parameters, please install `actionpack-xml_parser' gem.
 
-- 
cgit v1.2.3