diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2013-06-25 06:04:26 +0100 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-06-25 06:04:26 +0100 |
commit | 37b4276dbf22382788f66bd5361f0736aadb0425 (patch) | |
tree | 560f7cd9255afa0385c2786e1e1b9d6704af4a6f /tools | |
parent | 55d9176b4a07c5b4f91146d1d38926bee5088b5a (diff) | |
download | rails-37b4276dbf22382788f66bd5361f0736aadb0425.tar.gz rails-37b4276dbf22382788f66bd5361f0736aadb0425.tar.bz2 rails-37b4276dbf22382788f66bd5361f0736aadb0425.zip |
Fix shorthand routes where controller and action are in the scope
Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).
Fixes #9856
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions