parent_name is a string of nil, never a blank string so we don't need to
use presence.

Fix how to compute class name on habtm namespaced.

Conflicts:
	activerecord/CHANGELOG.md

Make filter_binds filter out symbols that are equal to strings

Conflicts:
	activerecord/CHANGELOG.md

ActiveRecord::Relation::Merger's filter_binds method does not filter out bind
variables when one of the attribute nodes has a string name, but the other has
a symbol name, even when those names are actually equal.

This can result in there being more bind variables than placeholders in the
generated SQL.  This is particularly an issue for PostgreSQL, where this is
treated as an error.

This patch changes the filter_binds method to make it convert both attribute
names to strings before comparing.

Add controller and action name to the fragment caching instrumentation payload

Conflicts:
	actionpack/CHANGELOG.md

Add multiple lines message support for SSE module

remove warning `ambiguous first argument; put parentheses or even spaces`

Add missing information, ref[#522c0fdb]

Use i18n master to run tests

Update Redcarpet to 3.1.2

This version fixes an API breakage between 3.0 and 3.1 ; the header
method's arity should not have changed.

[ci skip]

If we don't return early Ruby will memoize the value of the prefix of
the parent class what will make the subsequent searchs to not work as
expected.

If the early return we are avoiding the memoization.

But when using the deprecated path we need to memoize the value, so we
are not using early return for the deprecated path.

These methods are private API.

This is the rebased version of #15026

Closes #15026

Fixed Attribute Inheritance Issue

[Brad Bennett, Jessica Yao, & Lakshmi Parthasarathy]

Fix reference to sanitize helper test suite [ci skip]

Refactor delete_records method

this change was unneccsary as nothing was gained from it

Rename delete_all_records because this name better describes
what the method is doing. We can then remove :all from the
hm:t version and pull out the unoptimized call to load_target
in delete_records and pass it directly.

Refactor delete_count method to only handle delete_all or nullify/nil cases
and not destroy and switch to if/else rather than case statement. This
refactoring allows removal of :all symbol usage.

Refactor by creating two methods delete_all_records and delete_records
to be called by delete_all and delete (or destroy) respectively.
This reduces the number of conditionals required to handle _how_
records get deleted.

The new delete_count method handles how scope is applied to which
delete action.

A delete_all_records method also has to be called in has_many_through
association because of how the methods are chained. This will be
refactored later on.

remove deprecation warning

Then we can avoid nil checks

This deprecation was released in 4.1.0 and can be removed for 4.2.0,
deprecation message / handling is no longer necessary.

no need for redefine_method