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

When using a render :partial with :layout call, without giving a block,
if the given :partial had another render :partial call, the layout was
not being rendered. This commit fixes this context by storing variables
before rendering the partial, so they are not overrided in any successive
call to render partials down the path. All ActionPack tests are ok.

The given block was never being executed when another render :partial call
existed before the yield call, due to the block being overriden.

This commit also adds some more tests to render with :layout option.

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

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

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

- persisted? is the API defined in ActiveModel
- makes it easier for extension libraries to conform to ActiveModel APIs
  without concern for whether the extended object is specifically
  ActiveRecord

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

Fix FileStore cache incorrectly regenerating its key from a pathname when a regexp is used in expire_fragment

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

The other options mentioned were not good ideas and disclaimed as such in the documentation.

Conflicts:

	actionpack/lib/action_view/template/handlers/erb.rb

<%== x %> is syntactic sugar for <%= raw(x) %>
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#5918 status:committed]

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Ensure that HashWithIndifferentAccess duplication preserves class (for sublclasses) and default value [#5724 state:resolved]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

use column names as order by complex function parameters, fix for postgresql adapter to correctly remove ASC/DESC
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

[#5393 state:committed]

Correctly handle the case of an API response that returns a hash by treating a single hash argument as the resource instead of as options.