aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-19 06:07:48 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-19 10:10:00 -0300
commit61d5d2d8a97fd289b81991cd79dca3112e7ca135 (patch)
treed8f236d7ed6e7fd26829e0558ee5ddc242d49fee /actionpack/CHANGELOG.md
parenta82f1e3f5d11c8dfba9f4c911745ec40a7965216 (diff)
downloadrails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.gz
rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.bz2
rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.zip
Merge pull request #7668 from Draiken/fix_issue_6497
Removing to_shorthand to fix #6497 Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
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`