Revert "use File.basename to get the filename minus .yml"

This reverts commit 00c5342d96a3677c0a6a2bb8316c76182f5bdfdd.

Conflicts:
	activerecord/lib/active_record/fixtures.rb
Fix argument name in fixtures method

Relatedo to 8e44c93b4c0e4b1bdd0fca13b79f5be1088d6959.
fix railties CHANGELOG [ci skip]
update concerned tests
Merge pull request #8552 from frodsan/concerned_tests

Fix railties tests related to the addition of app/[models|controllers]/concerns, and improve changelog.
Address test_binary_data_is_not_logged with Oracle database

The number of sql statement logged depends on each database adapter
implementation.
Also, this test does not depends on how many sql statement executed.
Remove obfuscation support from mail_to helper

Removes support for :encode, :replace_at, and :replace_dot
options from the mail_to helper. Support for these options
has been extracted to the 'actionview-encoded_mail_to' gem.
Merge pull request #8523 from reednj77/remove-mail-to-encoding

Remove obfuscation support from mail_to helper
Keep index names when using  with sqlite3
Merge pull request #8554 from yahonda/binary_count_oracle

Address test_binary_data_is_not_logged with Oracle database
Merge pull request #8522 from senny/3489_index_names_on_copy

Leep index names when using `alter_table` with sqlite3. Closes #3489
Revert "Add test to deprecation of Path#children"

This reverts commit 29b1dc273e1ad6b9e13bf48fe3f12047850f9554.

Conflicts:
	railties/test/application/paths_test.rb

Reason: since 7f96e4317e1354852e9600becb16662de3c17691 was reverted,
Path#children is no longer deprecated.
attempt to fix slow runner name method
Move changelog entry to the top [ci skip]
Merge pull request #8559 from mshytikov/runner_method_is_slow_with_thread_safe

Attempt to fix slow runner name method
Fix: documentation for String#humanize
Integrate Journey into Action Dispatch

Move the Journey code underneath the ActionDispatch namespace so
that we don't pollute the global namespace with names that may
be used for models.

Fixes rails/journey#49.
Remove obsolete Hash extension needed for Ruby 1.8.x support

[ci skip]
Remove the actual extension file as well [ci skip]
remove code for Ruby 1.8.x support