Fix STI scopes using benolee's suggestion. Fixes #11939
Remove the use of String#% when formatting durations in log messages

This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
Merge branch '3-2-stable' into 3-2-sec

* 3-2-stable:
  make sure both headers are set before checking for ip spoofing
  Move set_inverse_instance to association.build_record
Merge pull request #12084 from Ben-M/3-2-stable

Fix STI scopes using benolee's suggestion. Fixes #11939
bumping version to 3.2.15.rc1
Add back set_inverse_instance on .add_to_target

We must have it in there too, so when an existent record is being concat to another,
we will have the inverse relation.
add regression test for set_inverse_instance on add_to_target
Merge pull request #12443 from arthurnn/add_inverse_of_add_target

Add inverse of add target
Merge pull request #12443 from arthurnn/add_inverse_of_add_target

Add inverse of add target
bumping to rc2
Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"

This reverts commit 7ed5bdc834479c39e3b0ad5a38bcffe27983c10d, reversing
changes made to 31c79e291f42b1d862df06c552fe002864aae705.

Reason: this caused a regression when the associated record is creted in
a before_create callback.

See https://github.com/rails/rails/pull/12413#issuecomment-25848163
Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"

This reverts commit ccd11d58910059f07b28cc518dbdad42cbc8ea0c, reversing
changes made to 54c05acdba138f3a7a3d44dfc922b0fe4e4cf554.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
https://github.com/rails/rails/pull/12413#issuecomment-25848163
Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"

This reverts commit 7ed5bdc834479c39e3b0ad5a38bcffe27983c10d, reversing
changes made to 31c79e291f42b1d862df06c552fe002864aae705.

Reason: this caused a regression when the associated record is creted in
a before_create callback.

See https://github.com/rails/rails/pull/12413#issuecomment-25848163
Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"

This reverts commit ccd11d58910059f07b28cc518dbdad42cbc8ea0c, reversing
changes made to 54c05acdba138f3a7a3d44dfc922b0fe4e4cf554.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
https://github.com/rails/rails/pull/12413#issuecomment-25848163
bumping to rc3
Merge branch '3-2-15' into 3-2-sec

* 3-2-15:
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Fix STI scopes using benolee's suggestion. Fixes #11939
bumping to 3.2.15
updating changelogs
Merge branch '3-2-sec' into 3-2-stable

* 3-2-sec:
  updating changelogs
  bumping to 3.2.15
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Remove the use of String#% when formatting durations in log messages

Conflicts:
	activerecord/CHANGELOG.md
Only use valid mime type symbols as cache keys

CVE-2013-6414