Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when failing to construct_limited_ids_condition.
Add coverage for the fact that pluck without an argument returns all the table's columns.
No point in memoizing a simple literal string.
Make NullRelation a bit more like a real relation by returning 0 for #calculate(:count)
Rather than raising ThrowResult when construct_limited_ids_conditions comes up empty, set the relation to NullRelation and rely on its results.

This will help avoid errors like 2fcafee250ee2, because in most cases NullRelation will do the right thing. Minor bonus is avoiding the use of exceptions for flow control.
Add note about upgrading custom routes from `put` to `patch`.
Prevent side effects in `Hash#with_indifferent_access`.
Fixing a failing railtie test by using the ENV variable to specify a
particular controller to search for in rake routes.
wonderfull => wonderful
No need to load 'rake/packagetask' as it's already

in 'rubygems/package_task'
Merge pull request #10824 from vipulnsward/wonderful

wonderfull => wonderful
Merge pull request #10825 from arunagw/remove-rake-packagetask-load

No need to load 'rake/packagetask' as it's already in 'rubygems/package_task'
Merge pull request #10747 from javan/patch-1

Add note about upgrading custom routes from `put` to `patch`.
Improve upgrade guide documentation about the PUT->PATCH change
Merge pull request #10827 from trevorturk/patch-upgrade-guide

Improve upgrade guide documentation about the PUT->PATCH change
Allow Date to be compared with Time (like it was possible to compare Time with Date)
Merge pull request #10809 from wangjohn/fix_failing_railtie_test

Fixing a failing railtie test by wrapping the command inside of sh -c
Revert "Merge pull request #4490 from EmmanuelOga/master"

This behaviour doesn't actually make sense, the context of
the child should not be affected by the parent. See #10492.

This reverts commit 5f8274efe128ffeec8fa3179460f5167a078f007, reversing
changes made to 81e837e810460d066a2e5fc5a795366ec8ab2313.
The behavior we had in place in rc1 was actually to convert to DateTime and use <=> from there. Restore that.
Merge branch 'master' of github.com:rails/rails