Added Numeric#in_milliseconds, like 1.hour.in_milliseconds, so we can feed them to JavaScript functions like getTime().
Merge branch 'master' of github.com:rails/rails
Extend ActiveRecord::Base#cache_key to take an optional list of timestamp attributes of which the highest will be used.
Add a test case for the scope enum adds
unscope now works on default_scope after 94924dc32baf78f13e289172534c2e71c9c8cade
Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, named where condition.
Explicit mapping for enum
Merge pull request #12747 from yury/explicit-enum-values

Explicit mapping for enum
Move documentation around a bit
Delegate #rewhere to all on the class like all other relation methods
Revert "ActiveRecord::Base#<=> has been removed.  Primary keys may not be in order," -- will be replaced with a check to ensure that the keys used for comparison are integers, and only fail if they are not.

This reverts commit 6256734e2d0bdd89f4b5d11da259d40afa0c95c7.

Conflicts:
	activerecord/CHANGELOG.md
Add test verifying that you can only sort ARs of the same type
Add test for ActiveRecord::Relation YAML serialization, for #5303 issue
Ensure backwards compability after the #deep_munge extraction
Code style for privacy indention
Aesthetics
Line up the comments for aesthetics
No web-console for now
Merge pull request #12750 from arunagw/webconsole-invite-only

Not adding webconsole by default in new apps
BACKTRACE environment variable to show unfiltered backtraces.

We used to support the `BACKTRACE` environment variable but when
we switched to MiniTest it got removed: f9382cd7948

This commit adds back the functionality to show the unfiltered backtrace when needed.
This also works when you run your tests with `rake`:

* `BACKTRACE=1 bin/rake test`
* `BACKTRACE=1 ruby -Itest ...`