From 61d5d2d8a97fd289b81991cd79dca3112e7ca135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 19 Sep 2012 06:07:48 -0700
Subject: Merge pull request #7668 from Draiken/fix_issue_6497

Removing to_shorthand to fix #6497
Conflicts:
	actionpack/CHANGELOG.md
---
 actionpack/CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index c52241a9c0..e86008d26c 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Rails 3.2.9 (unreleased) ##
 
+*   Fixed a bug with shorthand routes scoped with the `:module` option not
+    adding the module to the controller as described in issue #6497.
+    This should now work properly:
+
+        scope :module => "engine" do
+          get "api/version" # routes to engine/api#version
+        end
+
+    *Luiz Felipe Garcia Pereira*
+
 *   Respect `config.digest = false` for `asset_path`
 
     Previously, the `asset_path` internals only respected the `:digest`
-- 
cgit v1.2.3