SpawnMethods#merge returns the intersection when passed an array, and not the union. Update the documentation to reflect this.

This reverts commit 7f536f91.

Reason: If at all this is done, this should be done in rails master.

https://github.com/rails/rails/issues/4027

Editing log levels to reflect this doc: http://api.rubyonrails.org/classes/ActiveSupport/BufferedLogger/Severity.html

Documentation fix: Change the example for habtm association to use proc according to changelog

Make ActionController#head pass rack-link

Provided fix for calling rake tasks within mountable engines

Fix cache (FileStore) clear to keep .gitkeep.

Cover Rails::DBConsole with tests

Active Support Cache - race_condition_ttl should be an integer

RouteSet: optimize routes generation when globbing is used

Allows assert_redirected_to to accept a regular expression

use extract_options!

Minor ActionMailer tweaks

one.

cache_store has an extra option of :null_store.

RouteSet: remove some code dups

I found it strange that this guide is redirecting questions to a specific person. Heiko Webers' (@hawe) last blog post is a year and a half old, so it's not obvious that he's still active with Rails security. If he is, feel free to revert.

Fix issue with private kernel methods and collection associations

Change CollectionProxy#method_missing to use scoped.public_send, to
avoid a problem described in issue #2508 when trying to use class
methods with names like "open", that clash with private kernel methods.
Also changed the dynamic matcher instantiator to send straight to
scoped, to avoid another roundtrip to method_missing.

Add backtrace to development routing error page