favicon source shouldn't begin with a slash to reference assets pipeline resource
Merge pull request #12788 from kylefritz/patch-1

rdoc: favicon source shouldn't begin with a slash to reference asset pipeline resource [ci skip]
Merge pull request #12791 from jasonayre/ja/fix_autoload_error

add autoload :TransactionState to fix Marshal.load issues
Conflicts:
	activerecord/CHANGELOG.md
Update workaround for "Outside the Scope of Strong Parameters" [ci skip]

The previous example of how to permit a hash of unknown keys used .tap, but had the side effect of logging an "Unpermitted parameters" message despite being a successful workaround. The proposed workaround is ever so slightly better, imo, because it won't result in an "Unpermitted parameters" message being logged.
Merge pull request #12813 from gaurish/patch-2

fix broken url/formatting in Asset pipeline guide [ci skip]
Conflicts:
	guides/source/asset_pipeline.md
Merge pull request #12760 from pseidemann/master

fix simple_format escapes own output when sanitize is set to true
Conflicts:

	actionpack/lib/action_view/helpers/text_helper.rb
	actionview/CHANGELOG.md
Merge pull request #12821 from arunagw/aa-removed-missleading-message

clarified missleading message
Correct `as_json` return example to display miliseconds

As of 28ab79d7 TimeWithZone#as_json returns 3 decimal places of
sub-second accuracy. This just updates the example on the api docs
reflect that change.
Improve wording in AC::ParameterMissing error message
Merge pull request #12825 from huoxito/update-as_json-example

Correct `as_json` return example to display miliseconds
Fixed minor typo

instead of 'rake test' as shortcut, use 'rake'.

Closes #12780 [ci skip]
Use arel 4-0-stable branch
Merge pull request #12749 from iantropov/issue_5303

Add test for ActiveRecord::Relation YAML serialization, for #5303 issue
Merge pull request #12740 from gaurish/patch-1

Improve Errors when Controller Name or Action isn't specfied
Merge pull request #12834 from dredozubov/has_one_association_replacement

Fixes problem with replacing has_one association record with itself
Conflicts:
	activerecord/CHANGELOG.md
tidy Active Record CHANGELOG. [ci skip].
Fixed typo in migrations guide [ci skip]
Update security.md [ci skip]
updated documentation for Integer [ci skip]
Merge pull request #12748 from dm1try/fix_counter_cache_for_through_association

Fixes #11079, prevent the counter cache from being decremented twice when destroying a record on a has_many :through association
Conflicts:
	activerecord/CHANGELOG.md