Typppo
Update capture_helper.rb

if there's content for the right column, then we need the two-column class, if not the one-column
Use the instrumentation framework to instrument Strong Params
fixes active_record_querying #pluck example
remove the new metadata note in Rails 4 upgrade guide

this was pulled out of Rails 4, see rails/rails#8399 for the discussion
Some copy edit and formatting for upgrading guide.
Explained how merging of scope works
fixing typo in the merging scopes section
Adding a note for :body option in `mail` method.
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
Merge pull request #9621 from sakuro/migration-magic-comment-fix

Preserve magic comments and content encoding of copied migrations.
ensure response.stream is closed
Merge pull request #9627 from rubys/master

ensure response.stream is closed
Renumbering the comments in the application boot process.
Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_off

Renumbering the comments in the application boot process.
Bump up timeouts

This should fix travis.

Also ensuring that we don't try to kill when pid is nil.
Fix AMo code example indent, add missing author to entry [ci skip]
Update documentation for collection<< to reflect << on new records.

collection<< does not automatically fire update sql unless the parent object
is not a new record (and thus has a primary key).

eg:

p = Post.new
p.comments << Comment.new

does not call update sql until:

p.save

at which point it saves the parent object and then the collection object.

changes that to the