This reverts commit b5cf2b4b.

This reverts commit a0c761dc.

this can provide a significant performance boost during testing, by
preventing the GC from running too frequently.

this prevents test state from accumulating, resulting in leaked
objects and slow tests due to overactive GC.

Signed-off-by: NXavier Noria <fxn@hashref.com>

This reverts commit 08d94d3f.

Revert "In nested_attributes when association is not loaded and association record is saved then in memory record attributes should be saved"

This reverts commit 12bbc34a.

It caused errors when combined with attr_accessible, piggy back attributes fetched by :select, etc.  Leaving it in 3.0, but removing from 2.3

Don't add non-new records back to the target array after loading targets on associations, as that makes destroy_all destroy any created records that don't match the scope destroy_all is called on
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Let Rack::Utils.set_cookie_header! create the Set-Cookie header instead of manually fiddling with the response headers [#4941 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Revert "Fix AbstractStore so that it preserves Set-Cookie header as an array, rather than as newline separated strings"

This reverts commit 36b91e34.

Conflicts:

	actionpack/test/activerecord/active_record_store_test.rb

This is a backport of dd15a3fe.
Signed-off-by: NAndrew White <andyw@pixeltrix.co.uk>

Don't create a deprecation proxy object if the variable was passed in local_assigns [#1671 state:resolved]

Fix AbstractStore so that it preserves Set-Cookie header as an array, rather than as newline separated strings

Starting in 2.3.8 we stopped yielding to blocks passed in to
find_or_create_by_x methods.  This patch restores that behavior and
adds a case to test it.

There was a bug with find_or_create_by_x introduced in 2.3.9 - if you
included extra parameters for the create() then those parameters would
confuse the find() so you'd never get to the create().  This patch
filters the parameters so we only pass to find() the subset that it's
interested in.  The code for the filtering was modelled on the code in
base.rb's method_missing().

This addresses  CVE-2010-3933

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

AssociationCollection#include? working properly for objects added with build method [#3472 state:resolved]

Remove duplication of conditions generated for associations when used in conjunction with named_scopes [#4634 state: resolved]

Preserving :include options for hmt association with an order but without conditions [#5262 state:resolved]

This change introduced breakages and test failures.

This reverts commit 8141f089.

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

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

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