test-case => failing
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
Clarify what arguments are passed to redirect blocks - fixes #11056
remove trailing whitespace from Active Record CHANGELOG
Merge remote-tracking branch 'upstream/master'