Do not run this streaming test in Ruby 1.8, fix syntax error
Remove warning of not used variable
Duplicate possible frozen string from route

Ruby 1.9 freezes Hash string keys by default so where a route is
defined like this:

get 'search' => 'search'

then the Mapper will derive the action from the key. This blows up
later when the action is added to the parameters hash and the
encoding is forced.

Closes #3429
Add failing test case for #8460

Add a test case to ensure that fractional second updates are detected.
Revert "Merge pull request #6986 from kennyj/fix_6975"

This reverts commit 8905c1fb496641c3cdb7b3b816ae6d3d4b2c2b73.

Closes #8460

Conflicts:
	activerecord/test/cases/dirty_test.rb
Merge pull request #6197 from blakesmith/connection_adapters_without_explain_support

Don't run explain on slow queries for database adapters that don't support it
Add changelog entry for skipping explain from dbs that don't support it

Backport of #6197 in 29d564add926307fea8cd3f77caf88d735e252a1.
Fix pluck when columns/tables are reserved words.

Backport #7536 to fix #8968.

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/calculations.rb
Replaced abcs to config.
Merge pull request #9074 from gaynetdinov/replace_undefined_abcs_to_config_variable

Undefined abcs variable inside structure:dump task.
Fix the CHANGELOG entry order [ci skip]
Install latest bundler on Travis.

Attempt to fix travis error on 1.8.7/1.9.2:

    $ bundle install --path vendor/bundle
    ERROR: Gem bundler is not installed, run `gem install bundler` first.

    The command "bundle install --path vendor/bundle" failed and exited
    with 127 during install.
Add NumberHelper missing dependency

symbolize_keys depends on hash/keys AS core extension
Merge pull request #9113 from rosenfeld/patch-1

Add NumberHelper missing dependency
Add another NumberHelper missing dependency

Another missing dependency, now affecting #number_to_percentage.

It depends on reverse_merge.
Merge pull request #9114 from rosenfeld/patch-2

Add another NumberHelper missing dependency
Merge pull request #9043 from senny/backport_7536

Backport: Fix pluck when columns/tables are reserved words.
Fix markdown syntax in actionpack CHANGELOG.

Starting a line with an octothorpe makes an <h1>
Merge pull request #9078 from senny/6865_ar_count_with_uniq

`#count` in conjunction with `#uniq` performs distinct count.
Conflicts:
	activerecord/CHANGELOG.md
Duplicate column_defaults properly

Backport c517602 to fix #6115

Deleted:
    activerecord/lib/active_record/core.rb

Conflicts:
    activerecord/test/cases/base_test.rb