Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH]

Ensure NoMethodError isn't raised when some of the nested eager loaded associations are empty [#1696 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Ensure belongs_to association with a counter cache in name spaced model works [#1678 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Ensure self referential HABTM associations raise an exception if association_foreign_key is missing. [#1252 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-Off-By: NMichael Koziarski <michael@koziarski.com>

[#1202 state:committed]

Make belongs_to :dependent => :destroy  destroy self before associated object [#1079 state:resolved]

If foreign key constraints are in place then deleteing the associated object first will cause a foreign key violation
Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NFrederick Cheung <frederick.cheung@gmail.com>

Add :having option to find, to use in combination with grouped finds. Also added to has_many and has_and_belongs_to_many associations.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1028 state:committed]

Ensure hash conditions on referenced tables are considered when eager loading with limit/offset. [#1404 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1310 state:committed]

Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1310 state:committed]

  rake doc:guides

The rake task will generate guides inside doc/guides directory of your application. Open index.html to browse.

There are several situations it doesn't cater for, and the inconsistency isn't worth blocking 2.2.

explicitly including child associations that are also included in the parent association definition should not result in double records in the collection/double loads (#1110)
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1110 state:committed]

Add an additional conditions option to make it slightly easier for certain plugins.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#1087 state:committed]

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Support for updating a belongs to association from the foreign key (without saving and reloading the record)
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#142 state:committed]

Revert "Add :accessible option to Associations for allowing mass assignments using hash. [#474 state:resolved]"

This reverts commit e0750d6a.

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_collection.rb