Merge pull request #9611 from choudhuryanupam/master

Refactored test case with standard variable names
Merge pull request #9497 from route/subclass_from_attrs

Fix ActiveRecord `subclass_from_attrs` when eager_load is false.

Conflicts:
	activerecord/CHANGELOG.md
Avoid short-circuit return
Make sure options is a hash
The console --sandbox transaction should not be joinable

Thanks @neerajdotname for noticing this bug.
Fix changelog indent, remove self from method call in changelog/doc examples

[ci skip]
Refactored nested associations so they are more readable. Added comments
which make it clearer about what's going on.
Merge pull request #9614 from wangjohn/refactoring_nested_associations_for_readability

Refactored nested associations so they are more readable.
Fix incorrectly appended square brackets to a multiple select box

If an explicit name has been given and it already ends with "[]"

Before:

    select(:category, [], {}, multiple: true, name: "post[category][]")
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, multiple: true, name: "post[category][]")
    # => <select name="post[category][]" ...>
Merge pull request #8670 from sanemat/fix/rake-desc

Add rake test description
Adding a note for :body option in `mail` method.
Fix failing test regarding console change to fix sandboxing

Introduced in be3e10cd26bc8ec29c6474d03a08a8e733108e7d.
fixes enable_extension bug in postgresql_adapter

The use of quotations is required to install extensions with certain
characters in them (e.g. uuid-ossp).

removes CHANGELOG entry

Deemed unnecessary.
Preserve magic comments and content encoding of copied migrations.

During insertion of "# This migration comes from ... " comment at the beginning of
a migration, presence of magic comment was not considered.
strong parameter example for hashes with integer keys.

This replicates the situation described in
https://github.com/rails/strong_parameters/issues/114
fixed typo in strong parameters example
Remove extra whitespace and fix a comment

minor comment fix for consistency
Merge pull request #9623 from Agis-/patch-2

Remove extra whitespace and fix a comment
Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets

Fix incorrectly appended square brackets to a multiple select box

Before:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][]" ...>
Merge pull request #9621 from sakuro/migration-magic-comment-fix

Preserve magic comments and content encoding of copied migrations.