kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity
Ruby on Rails
9393 commits 72 branches 493 tags 355 MiB
Ruby 95%
JavaScript 4%
HTML 0.6%
CSS 0.3%
Find a file
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
actionmailer Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
actionpack Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
activemodel Merge docrails 2009-03-16 11:28:36 +00:00
activerecord Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
activeresource Merge docrails 2009-03-24 12:15:43 +00:00
activesupport Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
ci Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
doc/template Horo rdoc template 2008-06-22 10:38:25 -07:00
railties Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
.gitignore Bring abstract_controller up to date with rails/master 2009-04-13 15:18:45 -07:00
pushgems.rb No more svn version numbers to rely on, use timestamps instead 2008-05-11 18:21:47 -05:00
Rakefile Horo rdoc template 2008-06-22 10:38:25 -07:00
release.rb Use copy instead of export for release 2008-09-05 14:22:56 +02:00