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
Ensure that raise_on_unexpected_params configuration will work
Rename the configuration to raise_on_unpermitted_parameters

Also changed the exception to UnpermittedParameters
Add documentation to raise_on_unpermitted_parameters option

[ci skip]
Rename raise_on_unexpected_params to raise_on_unpermitted_parameters on the guides
Wrong copy and paste :bomb:

[ci skip]