use canonical #controller_path logic in controller test cases
Allow fetching multiple values from the cache at once

Add a simple API for fetching a list of entries from the cache, where
any missing entries are computed by a supplied block.
Instrument template compilation
fix failing test caused by 3771e4d511
Merge pull request #10488 from neerajdotname/10419-b

fix failing test caused by 3771e4d511
Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions

Fixing CHANGLOG description

Remove extra line.

Remove blank lines.
Merge pull request #10352 from zohlgren/fix_activerecord_sanitization_sanitize_sql_hash

Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions
Fix test asserting the sanitized SQL hash differently to some adapters
Confirm a record has not already been destroyed before decrementing
counter cache

At present, calling destroy multiple times on the same record results
in the belongs_to counter cache being decremented multiple times. With
this change the record is checked for whether it is already destroyed
prior to decrementing the counter cache.
Merge pull request #10478 from cainlevy/patch-1

use canonical #controller_path logic in controller test cases
Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy

Confirm a record has not already been destroyed before decrementing counter cache

Conflicts:
	activerecord/CHANGELOG.md
Improve CHANGELOG entry [ci skip]
Allow numbers in partial name for digesting

Add failing test for template with number at the end

Use \w for RENDER_DEPENDENCY regex

Spacing

Add CHANGELOG entry
Merge pull request #10446 from dasch/instrument-template-compilation

Instrument template compilation
Merge pull request #10377 from bricker/template_digest_ending_with_number

Allow numbers in partial name for digesting
Merge pull request #10234 from dasch/dasch/fetch-multi

Allow fetching multiple values from the cache at once
Handle other pk types in PostgreSQL gracefully.

In #10410 it was noted that you can no longer create PK's with the
type of bigserial in PostgreSQL in 4.0.0.rc1. This is mostly
because the newer adapter is checking for column type with the
id column instead of just letting it pass through like it did
before.

Side effects:
You may just create a PK column of a type that you really don't
want to be your PK. As far as I can tell this was allowed in 3.2.X
and perhaps an exception should be raised if you try and do
something extremely dumb.
Test that #fresh_when accepts an array

https://github.com/rails/etagger/pull/3
Merge pull request #10455 from patricksrobertson/bigserial_id_not_identifying_pk

Add PK constraint on bigserial ID columns on postgres adapter
Revert "Merge pull request #10455 from patricksrobertson/bigserial_id_not_identifying_pk"

This reverts commit 3043d45eefc3776d5f3a9e7d212a01f99d869ef8, reversing
changes made to ca0275d36b395631725c4583db5a45c06443fdb9.