stop doing assingments in an iterator
Bug fix: Evented notification subscribers can handle published events
Merge pull request #10672 from carllerche/master

Bug fix: Evented notification subscribers can handle published events
stop swallowing exceptions in assert_queries.  Methods that raise an
exception are unlikely to pass this assertion, but since the assertions
raise an exception, the original exception is lost.
Don't autorequire mocha to avoid deprecation warnings

- https://travis-ci.org/rails/rails/jobs/7264822 contains deprecated
  warnings given by Mocha version 0.14
- 632f215da added Mocha 0.14 to Gemfile
- But with the version, require: false was removed
- So Mocha started giving deprecation warnings
- Acc.to Mocha documentation(https://github.com/freerange/mocha#bundler)
  it should not be auto required.
Add test to AR's counter_cache_test.rb

According to
https://github.com/rails/rails/blob/b601399b72ab56cc01368f02615af99f45d1
4f02/activerecord/lib/active_record/counter_cache.rb#L14, u can pass
more then one association to the `reset_counters` method.
Fix tests which started to fail due to commit 0123c39f41e2062311b2197e6e230ef8ad67e20e

Due to commit 0123c39f41e2062311b2197e6e230ef8ad67e20e, column
topic.unique_replies_count has been added, and these test started to
fail since the tests depends on the topic tables column info.
Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-mocha

Don't autorequire mocha to avoid deprecation warnings
Merge pull request #10676 from tkhr/add-test-to-counter_cache_test.rb

Add test to counter cache test.rb
Fxied some typos
Merge pull request #10597 from steveklabnik/patch_documentation

Adding notes on PATCH to the upgrade guide. [ci skip]
Merge pull request #10678 from prathamesh-sonpatki/typos

Fixed some typos
Changed the CHANGELOG for active_support and improved the doc for inflector method classify
Revert "Document Rails::Generators::MailerGenerator"

This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364.

Reason: Let's not nodoc without reason.

[ci skip]
Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"

This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa.

Reason: Let's not nodoc without reason.

[ci skip]
Revert "ActionMailer::Collector should be nodoc'd"

This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f.

Reason: Let's not nodoc without reason.

[ci skip]
Revert "Changed the CHANGELOG for active_support and improved the doc for inflector method classify"

This reverts commit 8d5fcb691e7496900f1c77dff8d6e729c1b56201.

Reason: Changelogs are not to be edited in docrails.

[ci skip]
Revert "Corrected documentation and added some more for the classify method in inflectors"

This reverts commit 8f901dee9e2072dd20e0a252a89dd501d783d85b.
copy edits[ci skip]
Merge branch 'master' of github.com:lifo/docrails