fix deprecation warning in scaffold controllers
Merge pull request #11088 from nolman/nolman/scaffold-fix

fix deprecation warning in scaffold controllers
Change reference to all to scoped instead.

In #11088, `#to_a` was added to remove a deprecation around using
`#all`. I merged, but it really should have been `#scoped` instead, as
that's the preferred replacement.
restore correct scaffold generation
Merge pull request #11093 from nolman/restoring-scaffold-generation

restore correct scaffold generation