document id prefixed String usage of `.find`. refs #12891 [ci skip]
Take Hash with options inside Array in #url_for
Merge pull request #9599 from ognevsky/hash-inside-array-in-url-for

Take Hash with options inside Array in #url_for
Fix CHANGELOG typo [ci skip]
Set values instead of building hashes with single values for merging
Get rid of useless temp variable
Avoid hash lookups for building an array of required defaults

Only set the value once after it's calculated.
Merge pull request #12898 from chocoby/fix/changelog_comment

Fix CHANGELOG typo [ci skip]
Unify `cattr_*` interface: allow to pass a block to `cattr_reader`.

Example:

    class A
      cattr_reader(:defr) { 'default_reader_value' }
    end
    A.defr # => 'default_reader_value'
Remove broken Commmand Line guide link

[ci skip]
added one test case and example for ActiveRecord::Base.to_param method
Merge pull request #12899 from nateberkopec/remove_broken_internal_guide_link

Remove broken Commmand Line guide link
Merge pull request #12900 from kuldeepaggarwal/f-to-param

added one test case and example for ActiveRecord::Base.to_param method
explain how `to_param` wil truncate long values. [ci skip] refs #12900.
Merge pull request #10848 from 907th/add_block_to_cattr_reader

Fix #10847: allow to pass a block to `cattr_reader`.
Update action_controller_overview.md [ci skip]

Code style adherence
Merge pull request #12853 from joshjordan/master

Allocate one less object using html_safe during content_tag construction
Remove tests for not swallowing exceptions.

From PR, @tenderlove would prefer to not maintain these tests.
Merge pull request #12531 from iamvery/database-tasks-exit-status

Explicitly exit with status "1" for create and drop task failures

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #12779 from dougbarth/dont_swallow_exceptions_during_transactional_statements_in_mysql

Don't swallow exceptions in transctional statements