Merge pull request #12205 from claudiob/remove-unused-raw-email-fixtures

Remove unused raw email fixtures
Fix typo on instance variable get call
Disable prepared statements in the unprepared_statement block
Add CHANGELOG entry for #11065

[ci skip]
Add CHANGELOG entry for #11069

[ci skip]
Add CHANGELOG entry for #11440

[ci skip]
Add CHANGELOG entry for #11161

[ci skip]
Add CHANGELOG entry for de20a6d15ac98464b87e8be9a493050b741e2fd2

[ci skip]
Merge pull request #12206 from harshadsabne/master

Update 4_0_release_notes.md
Conflicts:
	guides/source/4_0_release_notes.md
Merge pull request #11603 from jetthoughts/join_strings_instead_of_contactination

Cleanup: replace String concatenation by joining for excerpt helper

Conflicts:
	actionview/CHANGELOG.md
Add CHANGELOG entry for #11603

[ci skip]
Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup

Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
	activesupport/CHANGELOG.md
Merge pull request #12159 from nashby/issue-12149

do not break params filtering on nil values
Merge pull request #12156 from rywall/from-copy-binds

Allow Relation#from to accept other relations with bind values.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #11698 from dmathieu/sqlite_tasks_without_rails

Let the SQLite rake tasks run without rails
Merge pull request #12222 from rcillo/fix-custom-flash

Custom flash should be defined only for the class that defines it and it's subclasses

Fixes #12057
Conflicts:
	actionpack/CHANGELOG.md
Bring "Getting Started" in line with the code.

We removed `:to` in the code examples, but not in the
description. Whoops!

This has already been fixed on edge.

Closes #12246
Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scope

Collapse where constraints to the Arel::Nodes::And node

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #12276 from kennyj/fix_12269

Fix an issue where router can't recognize downcased url encoding path.
Conflicts:
	actionpack/CHANGELOG.md
mention controller test base class in testing guide. [ci skip]