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
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][]" ...>
Adding a note for :body option in `mail` method.
Fix failing test regarding console change to fix sandboxing

Introduced in be3e10cd26bc8ec29c6474d03a08a8e733108e7d.
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.
ensure response.stream is closed
Merge pull request #9627 from rubys/master

ensure response.stream is closed