New output for scaffold generate [ci skip]
Merge pull request #11469 from bvogel/master

Update bcrypt-ruby stable version to 3.1
fixes plugin test for tutorial

[ci skip]
Merge pull request #11478 from newton10471/master

fixes plugin test for tutorial [ci skip]
Improve ActiveRecord::QueryMethods#includes docs

It's not immediately clear whether you can pass in multiple relations or
not. After going through the code a bit, I saw that the arguments are
just appended to an array. Also, added nested relations example.

[ci skip]
Merge pull request #11479 from henrikhodne/improve-ar-querymethods-includes-docs

Improve ActiveRecord::QueryMethods#includes docs [ci skip]
grammar fix in upgrade documentation
Merge pull request #11465 from arunagw/removed_missleading_readme_link_doc

Fixed README link in API
Use latest mysql2.

Fixes #11457
Merge pull request #11485 from simi/mysql2

Use latest mysql2.
Merge pull request #11483 from garysweaver/grammar_fix_in_upgrade_documentation

grammar fix in upgrade documentation
fixes the test case of that plugins
Merge pull request #159 from rajcybage/my_fix

fixes the test case of that plugins
Fix examples of number_to_percentage

[ci skip]
Use the canonical router on the CHANGELOG entry

Thanks @egilburg

[ci skip]
document the Rails::ConsoleMethods#helper and #controller methods

Closes rails/rails#11362
Revert "Fix SyntaxError in guides sample code"

This reverts commit f573df32d43c413a5098721ba6151ff190c23c6c.

The original idea of this documentation was to showcase the feature
where you can remove some only queries attributes with a single
key-value pair.
use the appropriate RDoc code markup

Thanks @fxn
remove duplication in test
Merge pull request #11491 from erichkist/ek-revert-unscope-patch

Revert "Fix SyntaxError in guides sample code"