Dont swallow errors when bad alias_method
Stop using mocha on app_rails_loader_test
Stop using mocha on configuration_test
Set the application logger using configuration
Stop using mocha on console_test
Stop using mocha on dbconsole_test
%i doesn't work on 1.9
reporting is only done in one thread, so we can safely remove the lock

(I think)
Added additional help messaging when there's scaffolding being generated and a migration already exists for the resource.

The user is now alerted that they are able to skip the conflicted migration file via the --skip option.
Update outdated test.

The current test is asserting against an outdated version of
Request#method where HEAD requests are treated as GET requests.
Update test to clearly reflect what it is testing for.
Fix duplicated test.

There is already another test covering Request#request_method. This
test should cover Request#method.
Remove redundant test.

Since we're stubbing the request, the test is actually just asserting
that `@method = env['REQUEST_METHOD']`. In order to the test against
the methodoverride middleware, we should test it against an actual
request. However, Rack is already covering this scenario so we can
remove this test.
Prefer to pass block when logging.

The Logger by default includes a guard which checks for the
logging level. By removing the custom logging guards, we can decouple
the logging guard from the logging action to be done.

This also follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
Merge pull request #16099 from tgxworld/pass_log_as_block

Prefer to pass block when logging.
Follow-up to #16097 [ci skip]

Even if this is not exactly the same, let's add a new-line character
instead of two spaces. While it's specified in the Markdown specs that
adding spaces at the end of the line creates a break-line tag, this is
a brittle approach as people may remove them saving the file on certain
editors.
Merge pull request #15762 from arthurnn/better_error_on_bad_alias_method

Dont swallow errors when bad alias_method
Modified migration conflict message to remove the string concatenation.
create_join_table uses same logic as HABTM reflections

Before this change, create_join_table would not remove the common prefix
in the join table name, unlike ActiveRecord::Reflections. A HABTM
between Music::Artist and Music::Record would use a table
music_artists_records, while create_join table would create
music_artists_music_records.
LOCALHOST definition should match any 127.0.0.0/8 address

The entire 127.0.0.0/8 range is assigned to the loopback address, not
only 127.0.0.0/24. This patch allows ActionDispatch::Request::LOCALHOST
to match any IPv4 127.0.0.0/8 loopback address.

The only place that the #local? method was previously under test was
in the show_expectations_test.rb file. I don't particularly like that
that's implicitly where this code is under test, and I feel like I
should move some of that testing code into the
test/dispatch/request_test.rb file, but I wanted some feedback first.

Credit goes to @sriedel for discovering the issue and adding the
patch.