diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 14:49:12 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 14:49:12 -0200 |
| commit | 1bfc5b4068238bcd82f0ed78351c97fec39e775a (patch) | |
| tree | 7ea2fa41783f0b5eb0460f651c2b4d878c5c4a5c /actionpack/lib | |
| parent | e34d856b8db970d7be09b3edbf6bd95150592bd6 (diff) | |
| download | rails-1bfc5b4068238bcd82f0ed78351c97fec39e775a.tar.gz rails-1bfc5b4068238bcd82f0ed78351c97fec39e775a.tar.bz2 rails-1bfc5b4068238bcd82f0ed78351c97fec39e775a.zip | |
Revert "Merge pull request #7668 from Draiken/fix_issue_6497"
This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing
changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292.
Conflicts:
actionpack/CHANGELOG.md
REASON: This added introduced a bug when you have a shorthand route
inside a nested namespace.
See
https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index c5cf413c8f..3e0bcfb5e8 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -182,7 +182,7 @@ module ActionDispatch controller ||= default_controller action ||= default_action - unless controller.is_a?(Regexp) + unless controller.is_a?(Regexp) || to_shorthand controller = [@scope[:module], controller].compact.join("/").presence end |