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.
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]
In Relation#empty? use #exists? instead of #count.
Merge pull request #12533 from szimek/use_exists_in_relation_empty

In Relation#empty? use #exists? instead of #count.
Remove extra variable creation and merge.
Instrument the generation of Action Mailer messages

The processing of outbound mail is instrumented with the key
`process.action_mailer`. The payload includes the mailer name as well as
the mailer method.
Merge pull request #12556 from dasch/dasch/nstrument-am-processing

Instrument the generation of Action Mailer messages
Merge pull request #12591 from vipulnsward/remove_mail_merge

Remove extra variable creation and merge.
Raise an exception when model without primary key calls .find_with_ids
Merge pull request #12549 from makimoto/raise-when-find-without-pk

Raise an exception when model without primary key calls .find_with_ids
Allow unscope to work with `where.not`

Allows you to call #unscope on a relation with negative equality operators,
i.e. Arel::Nodes::NotIn and Arel::Nodes::NotEqual that have been generated
through the use of where.not.