Added regression test for #8195.
Merge pull request #6376 from jgaskins/timestamp-microseconds

Increase numeric-timestamp precision to nanoseconds
Conflicts:
	activesupport/lib/active_support/core_ext/time/conversions.rb
Make sure the tests pass in the case closer to described in #8195
Allow users to choose the timestamp format in the cache key

This can be done using the class attribute cache_timestamp_format

Closes #8195
Add CHANGELOG entry for #6376.
Merge pull request #8441 from itzki/fix_decorate_columns

Backport test to ensure there won't be regressions.
The issue only happens on master at the moment.
Use 1.8 hash style :bomb:
Run backported serialized test without Identity Map

It fails with Identity Map because the find call returns the same
object, so the "content" attribute that we expect to raise "missing
attribute" is actually present.
Add :nsec format only for Ruby 1.9

Ruby 1.8 does not support this format in Time, so the format will only
be added to the available date formats on Ruby 1.9. Changelog entry was
changed to explain that as well.
Improve test name related to cache timestamp format [ci skip]
Merge pull request #8490 from mattv/fix_request_raw_post

Fix rewinding in ActionDispatch::Request#raw_post
Conflicts:
	actionpack/CHANGELOG.md
recognize migrations, in folders containing numbers and 'rb'.

Backport of #8500
Closes #8492

Conflicts:

	activerecord/test/cases/migrator_test.rb
Merge pull request #8504 from senny/backport_8492

Backport of #8500, recognize migrations, in folders containing numbers and 'rb'.
Clear url helper methods when routes are reloaded

Clear url helper methods when routes are reloaded by removing the
methods explicitly rather than just clearing the module because it
didn't work properly and could be the source of a memory leak.

Closes #8488.
Don't use 1.9 hash syntax on 3-2-stable
Remove unicode character encoding from ActiveSupport::JSON.encode

The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters
not in the Basic Multilingual Plane.  It is possible to escape them
for json using the weird encoding scheme of a twelve-character
sequence representing the UTF-16 surrogate pair (e.g. '𠜎' ->
"\u270e\u263a") but this wasn't properly handled in the escaping code.
Since raw UTF-8 is allowed in json, it was decided to simply pass
through the raw bytes rather than attempt to escape them.

Backport of https://github.com/zbskii/rails/commit/9ace3a8820a5270f9b3f37b593f8bbea3e940f73

Conflicts:

	activesupport/CHANGELOG.md
	activesupport/lib/active_support/json/encoding.rb
	activesupport/test/json/encoding_test.rb
Use 1.8 style hash in json encoding test
backport runner fixes to 3-2-stable

Add a runner hook to Rails::Application and Rails::Engine that requires
ActiveRecord::Base to avoid circular constant loading when using observers.

This commit backports cc7dd66, c0ba0f0 and 8d01c61.
Backport #8522, Keep index names when using  with sqlite3

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
	activerecord/test/cases/migration/rename_column_test.rb
Merge pull request #8558 from senny/backport_3489

Backport #8522, Keep index names when using  with sqlite3