…and update .gitignores.
This reverts commit f14ad41.
This reverts commit 4129449.
…ng tests on new machines, as well as CI, work well.
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: 2259ecf AR not available * This will be reimplemented with ActionORM or equivalent 06182ea implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb 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: 199e750 3942cb4 f8ea9f8 e3b166a ae9f258 4442312 0cb020b 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. 8c5cc66a831aadb159f3daaffa4208064c30af0e 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. 87e8b162463f13bd50d27398f020769460a770e3 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.
…rails application : rake doc:guides The rake task will generate guides inside doc/guides directory of your application. Open index.html to browse.
Signed-off-by: Michael Koziarski <email@example.com>