be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip]
Fix breakage in XmlMini

- Boolean parsing breaks on non strings (i.e. integer 1|0)
- Symbol parsing breaks on non strings.
- BigDecimal parsing breaks due to missing require.
- Update changelog.
psql implementation of #index_name_exists?
Do not discard query parameters on requests that use wrap_parameters
Associations now raise `ArgumentError` on name conflicts.

Dangerous association names conflicts include instance or class
methods already defined by `ActiveRecord::Base`.
Updated association_basics.md [ci skip]

Updated association_basics.md to include how to write migrations for self joins

Update association_basics.md

Corrected the update

Update association_basics.md

Typo fix

Changed :employee to :manager
Document default trim mode for Erubis and affected ERB tags [ci skip]
Fixes #12963
Merge pull request #13896 from laurocaetano/dangerous_association_names

Associations now raises `ArgumentError` on name conflicts. Closes #13217.
Merge pull request #13900 from zzak/issue_12963

Document default trim mode for Erubis and affected ERB tags. Fixes #12963 [ci skip]
Minor changelog improvements [ci skip]
Merge pull request #13780 from rohitpaulk/patch-1

Updated association_basics.md
Maintain the current timezone in wrap_with_time_zone

Extend the solution from the fix for #12163 to the general case where
`Time` methods are wrapped with a time zone.

Fixes #12596.
FilterRedirect is referenced at the class level from the Response

We can just require the file rather than going through the autoload
indirection
only ask for the location filters once
just require the template resolver

LookupContext is eagerly loaded, and FallbackFileSystemResolver is
referenced at the class level.  Just require the resolver from the
eagerly loaded class rather than jumping through autoload hoops
this class depends on JoinHelper, so we should require it
Fixes issue with parsing whitespace content back from database - fixes #13907
Merge pull request #12769 from birkirb/master

Boolean parser blows up on a Fixnum.

Conflicts:
	activesupport/CHANGELOG.md
Merge pull request #13912 from mauricio/bug-13907

Fixes issue with parsing whitespace content back from database - fixes #13907
Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-params

Do not discard query parameters on requests that use wrap_parameters

Conflicts:
	actionpack/CHANGELOG.md