never merge url options in to the first data hash

if you want options, don't mix them with the first hash, just pass them
all in with the second hash
always pass options to the _url method
only add the optiosn if they are not empty

I think this is wrong, but it gets the build passing for now. We should
always add options, but we need to make more guarantees about how the
underlying url helper is called
Form_tag_helper grammar fix [skip ci]
Merge pull request #14939 from jonatack/patch-8

Form_tag_helper grammar fix [skip ci]
Enhance a bit a few changelog entries [ci skip]
Follow up to 38ad5438 [ci skip]

This commit adds new lines between titles, paragraphs and code blocks
for an easier reading.

Moreover, in order to be consistent with the other guides, let's remove
the sharps on the right side of the different titles.

The "Running a Single Test" part was also explained after the "Testing
Active Record" one which shows how to run a single test under the scope
of a specific adapter.

Finally, let's explain the `-n` option to run a specific test method.
[ci skip] Update guides license to CC BY-SA 4.0 International.

Benefits: https://creativecommons.org/version4
Added link for 4.1 guides on edge guide [ci skip]
Tiny follow up to #14915 [ci skip]
Automaticly add username and email if configured in git-scm, as bundle gem
Works correctly if git not installed
skip-git should not hit git commands plugin generators
Merge pull request #14941 from arunagw/hbakhtiyor-new-plugin-command-advanced-config

Plugin gemspec
Merge pull request #14942 from JuanitoFatas/patch/cc-by-sa-4-0

[ci skip] Update guides license to CC BY-SA 4.0 International.
Add singular and plural form for some validation messages
Merge pull request #14943 from arunagw/hbakhtiyor-i18n-validation-message-singular-and-plural

Add singular and plural form for some validation messages
eliminate repetition in guide links for past releases [ci skip]
passing a nil should always raise an ArgumentError
push up bind params on "simple" subquery calculations

bind parameters we not being propogated to simple subquery calculation
calls. This fixes it