Remove unopened closing brace.
Add failing test for #9562

Rails 4.0.0 fails when trying to encode an ActiveSupport::TimeWithZone
that wraps a DateTime instance. This is fixed on master so add a test
to prevent regression.
Keep sub-second resolution when wrapping a DateTime value

Add `DateTime#usec` and `DateTime#nsec` so that `ActiveSupport::TimeWithZone`
keeps sub-second resolution when wrapping a `DateTime` value.

Fixes #10855
(cherry picked from commit 17f5d8e062909f1fcae25351834d8e89967b645e)

Conflicts:
	activesupport/CHANGELOG.md
Add missing require so that DateTime has the right superclass

If the DateTime core extensions were loaded before the Date core extensions
then you would get a superclass mismatch as DateTime hasn't been defined
yet so it gets set to Object by the acts_like core extension.

Fixes #11206

(cherry picked from commit 78f7d5b652000dbb1a11d34fe370c3fa82de840c)
Merge pull request #11387 from zzak/backport_714bb17

Backport 714bb17
Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompile

 Closes #11381: Ignore config.eager_load=true for rake
Documment config.log_formatter added on 51aeae91

[ci skip]
Merge pull request #11417 from arunagw/gem_source_index_no_required

Removing Gem.source_index [ci skip]
Backport #11437 to 4-0-stable. Fix default rendered format when calling render method without :content_type option.
Merge pull request #11438 from kennyj/fix_11393-40

Backport #11437 to 4-0-stable. Fix default rendered format when calling render method without :content_type option.
re-introduce `select_for_count` private method.

See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
Revert "Don't use Rack::Sendfile middleware if x_sendfile_header is not present"

This reverts commit 19ac034bdc9be175eff7cf54208ba14b43d97681.
And allows webservers to configure X-Sendfile-Type.

Closes #11440 thanks to [@MSch]
Rack::Sendfile is now included in middleware by default, change tests to reflect that
Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-case

Flag cookies as secure with ignore case in ActionDispatch::SSL
Merge pull request #11065 from gbuesing/hstsfix

ActionDispatch:SSL: don't include STS header in non-https responses
Only raise DelegationError if it's is the source of the exception

This fixes situations where nested NoMethodError exceptions are masked
by delegations. This would cause confusion especially where there was a
problem in the Rails booting process because of a delegation in the
routes reloading code.

Fixes #10559
(cherry picked from commit 07a4c76a07641840892463eb934400abdf694927)

Conflicts:
	activesupport/CHANGELOG.md
No need to add config for x_sendfile_header

Rack::Sendfile is loaded by default now
Merge pull request #10417 from jholton/fix_association_auto_save

autosave_association issue that occurs when table has unique index (resubmission)
Conflicts:

	activerecord/CHANGELOG.md
Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_association

Do not re-save destroyed association on saving parent object
`change_column` for PG adapter respects `:array` option.

Conflicts:

	activerecord/CHANGELOG.md