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: |
||
---|---|---|
.. | ||
action_controller | ||
action_dispatch | ||
action_pack | ||
action_view | ||
action_controller.rb | ||
action_dispatch.rb | ||
action_pack.rb | ||
action_view.rb | ||
actionpack.rb |