Fix STI scopes using benolee's suggestion. Fixes #11939
Merge pull request #12359 from arthurnn/inverse_on_callbacks

Make sure inverse_of is visible on the has_many callbacks
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/company.rb
on tests: dont always touch firm on validate
Merge pull request #12364 from arthurnn/test_fix_validate

Fix query counters when testing with IdentityMap on 3.2
fix inverse_of when find_or_initialize_by_*

inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was
found on the db.
Use Ruby 1.8 hash syntax
Merge pull request #12375 from arthurnn/inverse_after_find_or_initialize

Inverse after find or initialize
Move set_inverse_instance to association.build_record

[fixes #10371]
Merge pull request #12413 from arthurnn/inverse_of_on_build

Inverse of on build
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.
make sure both headers are set before checking for ip spoofing
Merge pull request #12410 from tamird/fix-ip-spoof-errors

Fix ip spoof errors
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