Merge branch 'master' into joindep

* master:
  Rephrase ActiveRecord transaction rollback warning
  Fix code blocks identation on AR and AS CHANGELOGs
  Removing unused fake models from actionpack tests
[ci skip] Fix number of methods added by association.

Also clean up some trailing spaces on line 1143-1146.
add a new local variable to track if digests are being stored, to ensure the cleanup works correctly
Fix typo in form_helper.rb
Merge pull request #12568 from adamyonk/patch-1

Fix typo in form_helper.rb
Merge pull request #12540 from wyaeld/bug/fix-recursive-digest

Ensure ActionView::Digestor.cache is correctly cleaned up
Ensure the state is clean after one failure
Merge pull request #12564 from JuanitoFatas/association-basics

[ci skip] Fix number of methods added by association.
Add Sass gobbling info to asset pipeline docs

[ci skip]
Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docs

Add sass globbing to asset pipeline docs [ci skip]
Make define_non_cyclic_method simpler
Fix some indentation on autosave association
Merge pull request #12569 from arthurnn/autosave_small_cleanip

Small cleanup on autosave association
Convert Fixnum into String the port number in MySQL
[ci skip] avoid deprecation warning in sample code

Account.find(1, lock: true)
-> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it.
Updated 3.2.x link [ci skip]
Merge pull request #11839 from chocoby/fix/convert_port_number

Convert Fixnum into String the port number like `db:structure:dump` task in MySQL.
Merge pull request #12560 from sue445/modify_find_lock_sample_code

avoid deprecation warning in sample code [ci skip]
Update I18n guide to note the additional features of the `translate` view helper
In Relation#empty? use #exists? instead of #count.