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/lib | |
| 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/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 cd2f464506..952219631a 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -166,7 +166,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 |