Fix test incompatible with 1.8.7
Merge pull request #11930 from UncleGene/ties_test

Fix test incompatible with 1.8.7
Fix 1.8.7 incompatible respond_to_missing
fix issue #11605
Merge pull request #12006 from kassio/11605-render-with-context-format

Render with context format
Merge pull request #12048 from tjouan/app_generator-bin_perms-umask

Comply with current umask when generating new app
Conflicts:
	railties/lib/rails/generators/rails/app/app_generator.rb
Fix STI scopes using benolee's suggestion. Fixes #11939
pass the extra params to the rack test environment so that routes with block constraints have access
on SchemaCache use the connection getter instead of the obj given
Merge pull request #12176 from arthurnn/ar32_schema_cache

on SchemaCache use the connection getter instead of the obj given
Merge pull request #9368 from CrowdFlower/3-2-stable

PR #5219 backported to 3-2
Fix FinderMethods#last unscoped primary key

Fixes table.joins(:relation).last(N) breaking on sqlite

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/finder_test.rb
Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup

Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
	activesupport/CHANGELOG.md
	activesupport/test/caching_test.rb
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]