mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
906aebceed
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:2259ecf368AR not available * This will be reimplemented with ActionORM or equivalent06182ea02eimplicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically893e9eb995Improve 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:199e750d463942cb406ef8ea9f85d4e3b166aab3ae9f258e0344423126c60cb020b4d6workaround 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.8c5cc66a83make 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.87e8b16246fix 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.
21 lines
345 B
Text
21 lines
345 B
Text
debug.log
|
|
doc/rdoc
|
|
activeresource/doc
|
|
activerecord/doc
|
|
actionpack/doc
|
|
actionmailer/doc
|
|
activesupport/doc
|
|
activeresource/pkg
|
|
activerecord/pkg
|
|
actionpack/pkg
|
|
actionmailer/pkg
|
|
activesupport/pkg
|
|
railties/pkg
|
|
railties/test/500.html
|
|
railties/doc/guides/html/images
|
|
railties/doc/guides/html/stylesheets
|
|
benches
|
|
railties/guides/output
|
|
*.rbc
|
|
*.swp
|
|
*.swo
|