Merge pull request #8459 from frodsan/explicit!

use :only instead of :except callback option in the controller template
Merge pull request #8462 from frodsan/update_guides_action_callbacks

Update guides to use _action callbacks [ci skip]
Update AR Changelog with correct example using includes

These queries don't seem to work without the includes clause. [ci skip]
Merge pull request #8457 from caike/master

Update AR Changelog with correct example using includes [ci skip]
Merge pull request #8395 from bmaland/attr_accessors

Use attr_accessor for Rails.{application,cache,logger}
Fix #assert_instance_method to also assert indented methods
use _action callbacks in actionmailer
Merge pull request #8465 from frodsan/update_am_action_callbacks

use _action callbacks in actionmailer
Merge pull request #8461 from frodsan/fix_assert_method_generators

Fix #assert_instance_method to also assert indented methods
Improve where.not docs [ci skip]

* Fix example queries
* Remove doc entries of where.like/not_like.
* Remove :chain from where.not related docs. To me that's an implementation
  detail and we don't expect people to use where(:chain).not.
Fix scaffold controller generator tests
Revert "Introduce Bundler and Gemfiles in a NOTE"

This reverts commit 83cb6fbd13f3c5ea3106b9a57964b1a6fb243682.

Reason: very trivial

[ci skip]
copy edits [ci skip]
Merge branch 'master' of github.com:lifo/docrails
Session variables for mysql, mysql2, and postgresql adapters can be set
in the new 'variables:' hash in each database config section in database.yml.
The key-value pairs of this hash will be sent in a 'SET key = value, ...'
query on new database connections.

The configure_connection methods from mysql and mysql2 into are
consolidated into the abstract_mysql base class.
update release notes [ci skip]
Merge pull request #8348 from danchoi/master

Kindle ebook generation with working section navigation
Security Guide: removing Mass Assignment.

Since mass assignment doesn't exist anymore, we don't need to discuss it.

I checked with @fxn last night before making this change.
Merge pull request #8346 from sodabrew/patch-1

Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters
Fix method assertion ensuring it will match "end" with the same indentation

Otherwise it was matching "end" lines from blocks within the method body,
making tests such as the migration ones fail.