diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 14:33:20 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 14:33:20 -0200 |
| commit | 4a8636264dedd5bfafab79b88812478ce333f1f8 (patch) | |
| tree | 345baa128e5cd07af3d2448f7fba331d477e7cce /actionpack/CHANGELOG.md | |
| parent | de3dff317010df12d15225f2bca4a7e914eb596c (diff) | |
| download | rails-4a8636264dedd5bfafab79b88812478ce333f1f8.tar.gz rails-4a8636264dedd5bfafab79b88812478ce333f1f8.tar.bz2 rails-4a8636264dedd5bfafab79b88812478ce333f1f8.zip | |
Revert "Merge pull request #7668 from Draiken/fix_issue_6497"
This reverts commit 61d5d2d8a97fd289b81991cd79dca3112e7ca135.
Conflicts:
actionpack/CHANGELOG.md
REASON: This added a backward incompatible change.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index a257e8c600..9da9e9366b 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 3.2.9 (unreleased) ## +* Revert the shorthand routes scoped with `:module` option fix + This added a regression since it is changing the URL mapping. + This makes the stable release backward compatible. + + *Rafael Mendonça França* + * Revert the `assert_template` fix to not pass with ever string that matches the template name. This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but this stable release will be backward compatible. @@ -72,16 +78,6 @@ *Tim Vandecasteele* -* 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` |