Rails One Click is not maintained anymore [ci skip]

Let's tell people that they should rely on Tokaido instead of Rails One
Click.

Fixes #14960.
Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception

Fix exception when logging SQL w/ nil binary value.

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #14949 from bogdan/empty-hash-array-parameterization

[Fixes #14948] Hash#to_query: right serialization for  empty hash and array
Conflicts:
	activesupport/CHANGELOG.md
Only accept actions without File::SEPARATOR in the name.

This will avoid directory traversal in implicit render.

Fixes: CVE-2014-0130
Merge pull request #14978 from bogdan/relation-join

[Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array
Preparing for 4.1.1 release
Merge branch '4-1-sec' into 4-1-stable

Conflicts:
	actionmailer/CHANGELOG.md
	actionpack/CHANGELOG.md
	actionview/CHANGELOG.md
	activemodel/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	guides/CHANGELOG.md
	railties/CHANGELOG.md
Update links to new rails version in guides [ci skip]
Merge pull request #15012 from schneems/schneems/headers-key

HTTP::Headers#key? correctly converts
Merge branch 'rm-trasaction-fix-13166'

Conflicts:
	activerecord/CHANGELOG.md

Backport of #13166
Merge pull request #12746 from coreyward/master

Fix Hash#deep_merge bug and improve documentation — resolves #12738
Merge pull request #15015 from pothibo/database-configuration

Use Rails::Paths::Path#existent in database_configuration
Conflicts:
	railties/CHANGELOG.md
Dup the changed_attributes otherwise we could lose them
Merge pull request #14992 from fredwu/habtm_relation_size_calculation_fix

Habtm relation size calculation fix. Fixes #14913, Fixes #14914.

Conflicts:
	activerecord/CHANGELOG.md
set a constant for the "anonymous" habtm model fixes #15022

I wanted the middle model to be anonymous, but we have to give it a name
for marshal support. :'(
Merge pull request #15042 from arthurnn/revert_dirty_transactions

Reverts dirty track restore on transactions rollback
Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #15044 from zzak/travis_ruby_too_won

Only need MINOR version level to test Ruby 2.1.x on Travis
Conflicts:
	.travis.yml
use fnmatch to test for case insensitive file systems

this is due to:

  https://bugs.ruby-lang.org/issues/5994
feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053
ActionDispatch::Http::URL.normalize_port should not strip port for protocol relative URL.

(cherry picked from commit be93d94ef28421a2dbcd6ed870b454433a5a0a72)