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
apps that depend on active record should load fixtures
Revert "Warning removed unused variable task_name"

This reverts commit 106e15927f0dd8060fc37eff44b823a92fa94bd2.
Revert "Update Rake tasks to call `rails test` instead"

This reverts commit b51673fbd9563bd3ffa22e22255ca1cef80cfb6d.
ensure the schema checking is done in the dev connection
default task should also be in the test env
switch to Rails::TestTask
a test file can be provided to rake, e.g.:

  rake test path/to/test.rb
switch the testing tests to use rake
test no longer makes sense after requiring all test files
only match the default task
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]
Changed rspec/model directory example to spec/models
Fixed Typo
check pending migrations against the test db
Add missing require to inheritance test
Fix some railties test warnings