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

Object#returning should be Kernel#returning

Commit f8f36534 broke setting the session ID cookie for requests without 'HTTP_COOKIE' header
when using activerecord or memcache store. Integration tests didn't catch this because they
always set the HTTP_COOKIE header for mock requests, so now this is changed to only set the
header if there are cookies.

[#5581 state:committed]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

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

Adding option to ActiveResource to allow you to not reset the previously stored requests and responses by passing false to respond_to

Backport of commit 2a1b23f851ea3d4634fc68b74fe6b1afed23d3ef on rails/master

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

This reverts commit 64082b35.

This change broke compatibility with 1.8.6 and was only needed for older 1.9.2 versions

Conflicts:

	activerecord/lib/active_record/attribute_methods.rb

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

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

[#3374]

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>

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

changing fixtures back to superclass_delegating_accessor until we can convert them to class_attributes

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

Otherwise rake tasks which depend on environment will get errors about missing constants.

Sessions should not be created until written to and session data should be destroyed on reset. [#4938 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>