This should fix travis.

Also ensuring that we don't try to kill when pid is nil.

Renumbering the comments in the application boot process.

ensure response.stream is closed

Preserve magic comments and content encoding of copied migrations.

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][]" ...>

Remove extra whitespace and fix a comment

minor comment fix for consistency

This replicates the situation described in
https://github.com/rails/strong_parameters/issues/114

During insertion of "# This migration comes from ... " comment at the beginning of
a migration, presence of magic comment was not considered.

Introduced in be3e10cd.

Add rake test description

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][]" ...>

Refactored nested associations so they are more readable.

which make it clearer about what's going on.

[ci skip]

Thanks @neerajdotname for noticing this bug.

Fix ActiveRecord `subclass_from_attrs` when eager_load is false.

Conflicts:
	activerecord/CHANGELOG.md

Refactored test case with standard variable names

I've also added a proper acceptance test which reproduced the issue.

Closes #9513, #9515.

Use the index name explicitly provided in a migration when reverting.

Fixes #8868

Conflicts:
	activerecord/CHANGELOG.md

Unprepared Visitor + unprepared_statement

Conflicts:
	activerecord/CHANGELOG.md

Using latest AR-JDBC for JRuby

Introduced in f1082b85.
Full changelog in 9f007d7f.

[ci skip]

7365 merging scopes for where clauses 

this was pulled out of Rails 4, see rails/rails#8399 for the discussion