ActionDispatch:SSL: don't include STS header in non-https responses
replace all older rocket sign to new ":" from examples of active record and active models
Merge pull request #11067 from rajars2576/fix_older_rocket

replace all older rocket sign to new ":" from examples of active record ...
test-case to prevent regressions described in #10901.
Flag cookies as secure with ignore case in ActionDispatch::SSL
Fix `another_contract` not being used warning
Merge pull request #11075 from vipulnsward/remove_record

Remove `another_contract` as it isn't being used
Add CHANGELOG entry for #10971

[ci skip]

Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #11065 from gbuesing/hstsfix

ActionDispatch:SSL: don't include STS header in non-https responses
Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-case

Flag cookies as secure with ignore case in ActionDispatch::SSL
test-case => failing
Fix shorthand routes where controller and action are in the scope

Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).

Fixes #9856
Clarify what arguments are passed to redirect blocks - fixes #11056
remove trailing whitespace from Active Record CHANGELOG
Fixing  Issue #11083

Removing other occurrences of `the` appearing twice
Merge pull request #11084 from arkiver/master

Fixing issue  #11083
Improved grammar and replaced 'dbs' slang with 'databases'