+ Add test for auto timestamps update of both old & new parent records
Modifies belong_to touch callback to touch old associations also #9091
bugfix, when matching multiple paths with `get`, `post`, ...

This problem was introduced with:

https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
routing shorthand syntax works with multiple paths

Closes #9913.

We need to expand the match shorthand syntax for every path.
Move alias method near to the aliased one in collection proxy
fix regression in Mapper when `format:` was used in a `scope`.

Closes #10071

`#normalize_path!` depends on the options so we need to call
`#normalize_options!` first to make sure everything is set correctly.
Avoid running bundler on tests that don't need it
Remove comments about removing LegacyKeyGenerator in 4.1
Merge pull request #10072 from senny/10071_format_on_scope_block_is_ignored

fix regression in Mapper when `format:` was used in a `scope`.
Merge pull request #10070 from rubys/skip_bundle_in_railties_tests

Avoid running bundler on tests that don't need it
Merge pull request #9932 from senny/9913_routing_problem

routing bugfixes when matching multiple paths
Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-key-generator

Remove comments about removing LegacyKeyGenerator in 4.1
optimize some code around merge
Merge pull request #10049 from vipulnsward/optimize_around_merge_v1

optimize some code around merge
Merge pull request #9141 from adamgamble/issue-9091

belongs_to :touch should touch old record when transitioning.
Move changelog entry to the top and fix conflict [ci skip]
Add missing require to inheritance test
Fix some railties test warnings
Merge pull request #10078 from vipulnsward/railties_warning_fix_v1

Fix some railties test warnings
Fixed Typo