diff options
| author | Luiz Felipe <luiz.felipe.gp@gmail.com> | 2012-09-17 11:13:45 -0300 |
|---|---|---|
| committer | Luiz Felipe <luiz.felipe.gp@gmail.com> | 2012-09-19 08:02:37 -0300 |
| commit | 641ea6925790771acb6e91b73f9efa6ded834761 (patch) | |
| tree | c77176500f6dff0778c492aae744110a2e7916d9 /actionpack/CHANGELOG.md | |
| parent | 731d8095355225a9777922c92b453b0c9c7e8e03 (diff) | |
| download | rails-641ea6925790771acb6e91b73f9efa6ded834761.tar.gz rails-641ea6925790771acb6e91b73f9efa6ded834761.tar.bz2 rails-641ea6925790771acb6e91b73f9efa6ded834761.zip | |
Removing to_shorthand from default_controller_and_action. Fixes #6497
When using shortcut routes inside an engine the "to_shorthand" variable
is set to true, causing the module scope of the route to not be applied.
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 39105c5ca3..7212e3a289 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -4,9 +4,19 @@ *Yves Senn* -* Allow pass couple extensions to ActionView::Template.register_template_handler call. *Tima Maslyuchenko* +* Allow pass couple extensions to `ActionView::Template.register_template_handler` call. *Tima Maslyuchenko* -* Sprockets integration has been extracted from Action Pack and the `sprockets-rails` +* 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* + +* Sprockets integration has been extracted from Action Pack and the `sprockets-rails` gem should be added to Gemfile (under the assets group) in order to use Rails asset pipeline in future versions of Rails. |