Remove accidentally committed vi .swp file.
Merge pull request #11391 from schuetzm/remove-swp-file

Remove accidentally committed vi .swp file.
Better not mutate the given options Hash
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.

(cherry picked from commit ad01b8da354268cebfae1519c28d19d75576ccb1)
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
Add documentation for add_flash_types [ci skip]

Document a little bit the ActionController::Flash::add_flash_types
class method.
Merge pull request #11394 from robin850/patch-8

Add documentation for add_flash_types [ci skip]
 #11381: Ignore config.eager_load=true for rake

Closes #11381
Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompile

 #11381: Ignore config.eager_load=true for rake
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
Array#to_formatted_s does not call each element's to_s anymore

Array#to_s calls each element's inspect since ruby 1.9
Add missing require
Fix a grammatical error/typo in Active Record Associations guide.
Merge pull request #11400 from dpdawson/master

Fix a grammatical error/typo in Active Record Associations guide. [ci skip]
Documment config.log_formatter added on 51aeae91

[ci skip]
Improve Active View Overview guide. [ci skip]
Merge pull request #11401 from dpdawson/master

Improved Active View Overview guide. [ci skip]
move `MissingHelperError` out of the `ClassMethods` module.
add test-case to verify `error.path` when a helper was not found.

This verifies the code added with:
https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af
Typo fix [skip ci]