Merge pull request #8722 from kwstannard/string_to_date_change

Better error message for String#to_date
Merge pull request #8760 from amatsuda/railties_failing_tests_fix

fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057
Merge pull request #8633 from mykola-kyryk/issue_8628

Allow environment name to start with a substring of the default
environment names.

Fixes #8628
Small typo fix in railties/CHANGELOG.md
Merge pull request #8761 from mattdbridges/patch-3

Small typo fix in railties/CHANGELOG.md
added marshal_load and marshal_dump for ProxyTestResult. Behavior of method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
Merge pull request #8762 from hsbt/fix-marshal_load

added marshal_load and marshal_dump for ProxyTestResult. Behavior of met...
Move changelog entry in railties to the top

Other minor changelog improvements [ci skip]
Move class method to instance in dbconsole

This method doesn't need to be in the class, since it's only used only
from the instance.
Remove unnecessary begin..rescue..end, use only rescue
Document new configuration option action_controller.raise_on_unexpected_params.
Don't use layout when requested from xhr
beginrescueend has ended
Add join table migration generator to usage help.
[#8743] Test case

- Reverting #a3cf03ef99 fixes the issue

Conflicts:
	activerecord/test/cases/relations_test.rb
Allow developers to enable raising of exception when unexpected params are provided.
Don't use Rails.root since it is not available at this point
Revert "[#8743] Test case"

This reverts commit 162e2859813b31c50700b453aa61992dfa57139e.

This commit was added by mistake, sorry :bow:
Merge pull request #8752 from thomasfedb/master

Exception on unexpected params when enabled.
Fix typo