Making test accurately reflect what is going on in the schema migrations test
Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased

REBASED: fixing assert_template bug when template matches expected, but not ends with
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_controller/test_case.rb
New CHANGELOG entries always in the top [ci skip]
Fix reference to code sample in Getting Started.

Fixes #7799.
Merge pull request #7802 from steveklabnik/issue_7799

Fix reference to code sample in Getting Started.
Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
Since File instance doesn't respond to #open use a double to test the
behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb
Merge pull request #6450 from iHiD/resource_generator_routes_master

Master branch: Fixed generated whitespace in routes when using namespaced resource.

Merge pull request #7811 from iHiD/resource_generator_routes_master

Fix the build (Broken scaffold routes test)
Merge pull request #7789 from senny/7777_resource_functions_modify_options

resource and resources do no longer modify passed options
Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables

prefix TemplateAssertions ivars.

Closes #7459
Conflicts:
	actionpack/lib/action_controller/test_case.rb
	actionpack/lib/action_view/test_case.rb
Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through

Fix reset_counters crashing on has_many :through associations.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/counter_cache.rb
Refactor

Conflicts:
	activerecord/lib/active_record/counter_cache.rb
Update supported ruby versions error message in ruby_version_check.rb
Merge pull request #7836 from lihanli/error-msg-update

Update supported ruby versions error message in ruby_version_check.rb
Merge pull request #6978 from frodsan/count_nosql_unsaved_parent

Count returns 0 without querying if parent is not saved
Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_letters

postgres, quote table names when fetching the primary key (#5920)
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
Merge pull request #7848 from senny/3415_assert_template_has_nil_variable

can't pass :locals to #assert_template without a view test case (#3415)
Conflicts:
	actionpack/CHANGELOG.md
Accept :remote as symbol in link_to options

Accept either :remote or 'remote' in both the html_options and
(url_)options hash arguments to link_to.
Use the Ruby 1.8 hash syntax
Merge pull request #7865 from teleological/link_to_remote_3_2

Accept :remote as symbol in link_to options (backport)