Minitest upgrade broke build

https://github.com/seattlerb/minitest/commit/34760e3b268bc1bb4ac5fe1a44ef1ff0a2f9bd4d

This PR should fix build
Some improvements on building nested forms. [ci skip]
Merge pull request #13214 from JuanitoFatas/master

Some improvements on building nested forms. [ci skip]
Merge pull request #13213 from arunagw/aa-minitest-version-fix

Minitest upgrade broke build
A Cycle object should accept an array and cycle through it as it would
with a set of comma-separated objects.
Merge pull request #13059 from imkmf/cycle-accepts-array

Cycle object should accept an array

Conflicts:
	actionview/CHANGELOG.md
Very tiny typo fix [ci skip]
Merge pull request #13219 from robin850/patch-11

Very tiny typo fix [ci skip]
fix typo, "state_state" should be "stale_state" [ci skip]
Merge pull request #13221 from stereoscott/patch-1

fix tiny typo in comment, "state_state" should be "stale_state" [ci skip]
Allow code execution in case no variant has been set with variant.none
Variants can be declared without a block to signify their presence in the controller
Merge branch 'master' into fxn/string-pools