Signed-off-by: NJosé Valim <jose.valim@gmail.com>

The error page shown when the method you are requesting on a controller
doesn't specify which controller the method is missing from
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

If you are setting a hash or an array in class_attribute or you need
to freeze it, to ensure people won't modify it in place or you need
to dup it on inheritance.

Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. [#4818 state:resolved]
Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>

[#4804 state:resolved]
Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>

Don't overwrite unsaved updates when loading an association but preserve the order of the loaded records. [#4642 state:resolved]
Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#3914 state:open]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Make logic for after_commit and after_rollback :on option work like it does for validation callbacks.

[#2991 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Revert "Temporarily revert "Update after_commit and after_rollback docs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction.""

This reverts commit 1b2941cb.

[#2991]

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

This reverts commit 67a60ee3.

Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>

[#4799 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Temporarily revert "Update after_commit and after_rollback docs and tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."

This reverts commits d2a49e4b and da840d13.

[#2991]

Conflicts:

	activerecord/CHANGELOG
	activerecord/lib/active_record/transactions.rb
	activerecord/test/cases/transaction_callbacks_test.rb

Signed-off-by: Nwycats <wycats@gmail.com>