Carl Lerche & Yehuda Katz 906aebceed Bring abstract_controller up to date with rails/master ... Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb995 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46 3942cb406e f8ea9f85d4 e3b166aab3 ae9f258e03 44423126c6 0cb020b4d6 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a83 make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b16246 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.		2009-04-13 15:18:45 -07:00
..
_column.html.erb	Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved]	2008-10-28 17:31:33 -05:00
block_with_layout.erb	Fixed rendering of partials with layout when done from site layout (closes #9209) [antramm]	2008-01-03 15:28:36 +00:00
builder.builder	Apply the rest of Chads patch	2007-02-21 00:29:44 +00:00
partial_with_layout.erb	Fixed rendering of partials with layout when done from site layout (closes #9209) [antramm]	2008-01-03 15:28:36 +00:00
standard.erb	Apply the rest of Chads patch	2007-02-21 00:29:44 +00:00
talk_from_action.erb	Apply the rest of Chads patch	2007-02-21 00:29:44 +00:00
xhr.html.erb	correctly handle layouts for AJAX requests and regular js files [#2052 state:resolved]	2009-02-24 10:38:07 -06:00
yield.erb	Apply the rest of Chads patch	2007-02-21 00:29:44 +00:00