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.
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.
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
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
copy edits [ci skip]
Merge branch 'master' of github.com:lifo/docrails
Merge pull request #9630 from robertjwhitney/update_collection_docs

Update documentation for collection<< to reflect behavior for new parent objects.
Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].
Merge pull request #9632 from senny/unify_the_changelogs

Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]
Deprecate #connection in favour of accessing it via the class

This allows end-users to have a `connection` method on their models
without clashing with ActiveRecord internals.
Fix race condition in test

This should fix travis. For real this time! This is the one!

The readpartial(100) meant that an earlier assert_stdout could chomp up
the output that a later assert_stdout wants, meaning that the later
assertion fails.

Reading only 1 byte at a time ensure that we don't read any more than is
necessary to verify the assertion.