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
..
addresses
alternate_helpers	Allow helpers directory to be overridden via ActionController::Base.helpers_dir (Sam Pohlenz) [#1424 state:committed]	2008-11-23 13:42:53 +01:00
bad_customers
content_type
customers
db_definitions
developers
fun
functional_caching
good_customers
happy_path/render_action	Started implementing render :action	2009-03-19 13:35:39 -07:00
helpers
layout_tests	Bring abstract_controller up to date with rails/master	2009-04-13 15:18:45 -07:00
layouts	Bring abstract_controller up to date with rails/master	2009-04-13 15:18:45 -07:00
mascots
multipart	Allow empty files to be uploaded	2009-01-20 20:34:35 -06:00
override/test
override2/layouts/test
post_test
projects
public	Added localized rescue (404.da.html) [#1835 state:committed]	2009-02-02 17:56:22 +01:00
quiz/questions	Fixed simplified render with nested models [#2042 state:resolved]	2009-03-07 14:05:18 -06:00
replies
respond_to
scope/test
symlink_parent
test	Bring abstract_controller up to date with rails/master	2009-04-13 15:18:45 -07:00
topics
_top_level_partial.html.erb	Fix rendering partials at the top level [#795 state:resolved]	2008-08-13 19:15:35 -05:00
_top_level_partial_only.erb	Fix rendering partials at the top level [#795 state:resolved]	2008-08-13 19:15:35 -05:00
companies.yml
company.rb
developer.rb
developers.yml
developers_projects.yml
mascot.rb
mascots.yml
project.rb
projects.yml
replies.yml	Remove the irrelevant fixture added in fe6ffce51d	2009-01-24 18:22:17 +00:00
reply.rb
shared.html.erb
topic.rb
topics.yml