Fix eagerly loading associations without primary keys
Unset association when existing record is destroyed.

To avoid foreign key errors (and invalid data) in the database, when a belongs_to association is destroyed, it should also be nil'd out on the parent object.
Change JoinPart test from an integration to a unit test
Added a note for smtp_settings.enable_starttls_auto
Fix rake guides:validate task as it should be run from the guides directory; add exception handling
Fix HTML validation errors
Merge branch 'master' of github.com:lifo/docrails
Revert "Fix rake guides:validate task as it should be run from the guides directory; add exception handling"

This kind of changes should go on a pull request instead.

This reverts commit ecae2f0ef0452f8d333525a6aed58e5ab8d3ccb1.
Fix rake guides:validate

This rake task was looking for the output folder in the wrong place.
Add exception handling to rake guides:validate

If the validation of a guide encounters an exception, inform about it
and continue with the loop to validate the rest.
Merge pull request #107 from jaimeiniesta/master

Fix rake guides:validate
Guide: improvements to "The Flash" section.

Correct :error -> :alert, mention FlashHash class, mention that
you're not limited to notices and alerts, clean up.
Minor update for usage of git command

after running, git add .
do not need -a option to git commit
Update guides/source/rails_application_templates.textile

think that a quoted string will be better as it will automatically 
escape double-quotes as well
default headers init
Merge pull request #108 from homakov/master

Default headers description
Added clairifications for default security headers.
Add Missing Keys from Journey on failed URL format

Many named routes have keys that are required to successfully resolve. If a key is left off like this:

    <%= link_to 'user', user_path %>

This will produce an error like this:

    No route matches {:action=>"show", :controller=>"users"}

Since we know that the :id is missing, we can add extra debugging information to the error message.

    No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id]


This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url. 

While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious. 

This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message. 

Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421
refactor route_set `generate_extras` functionality

The result of Generator with or without the @extras instance variable set contains the desired information. Rather than preserving state when initializing the original object, we can simply extract the keys from the resultant parameters.

ATP Actionpack, railties
Merge pull request #109 from aantix/default_security_headers_clarifications

Added clairifications for default security headers.