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
remove unused variable
Merge pull request #10486 from vipulnsward/remove_variable

remove unused variable
raise IrreversibleMigration if no column given

fixes #10419

Following code should raise  IrreversibleMigration. But the code was
failing since options is an array and not a hash.

def change
  change_table :users do |t|
    t.remove_index [:name, :email]
  end
end

Fix was to check if the options is a Hash before operating on it.
Merge pull request #10437 from neerajdotname/10419

raise IrreversibleMigration if no column given
let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]

See the comment in the rescue clause towards the top of the patch for the rationale.
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