Merge pull request #9464 from jcoyne/assert_template_file

Allow use of assert_template with the :file option.
Move AP changelog entry to the top [ci skip]
Fix hash spaces and use 1.9 style hash [ci skip]
Combine scope conditions using AND

Currently Post.active.inactive will result in Post.inactive since
the last where clause wins when scopes are merged.

This pull request will merge all scopes ( barring defaul scope)
using AND.

The default scope will be overridden if another scope acts on the
same where clause.

closes #7365
SQLite3 3.6.8+ supports savepoints

http://www.sqlite.org/lang_savepoint.html
https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L130-L132
Merge pull request #9605 from neerajdotname/sqlite-support-savepoint

SQLite3 3.6.8+ supports savepoints
Fix warnings
If an index can't be found by column, use the index name.

schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858.  this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
remove the new metadata note in Rails 4 upgrade guide

this was pulled out of Rails 4, see rails/rails#8399 for the discussion
Unprepared Visitor + unprepared_statement
Some copy edit and formatting for upgrading guide.
Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where

7365 merging scopes for where clauses
Write a more comprehensive CHANGELOG message [ci skip]
Update test name to reflect change in how scopes merging works

Introduced in f1082b8588a9144eedb34d511f0074031f692d98.
Full changelog in 9f007d7fe5f90257c71baa2c4e7c76fb44512986.

[ci skip]
Merge pull request #9609 from arunagw/using-latest-arjdbc

Using latest AR-JDBC for JRuby
Merge pull request #8966 from cfabianski/disable_prepared_statement_when_preparing_a_query

Unprepared Visitor + unprepared_statement

Conflicts:
	activerecord/CHANGELOG.md
Merge pull request #8868 from tehgeekmeister/master

Use the index name explicitly provided in a migration when reverting.

Fixes #8868

Conflicts:
	activerecord/CHANGELOG.md
Explained how merging of scope works
fixing typo in the merging scopes section
Fix rails console --sandbox

I've also added a proper acceptance test which reproduced the issue.

Closes #9513, #9515.