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: |
||
---|---|---|
.. | ||
fixtures | ||
abstract_unit.rb | ||
asset_host_test.rb | ||
delivery_method_test.rb | ||
mail_helper_test.rb | ||
mail_layout_test.rb | ||
mail_render_test.rb | ||
mail_service_test.rb | ||
quoting_test.rb | ||
test_helper_test.rb | ||
tmail_test.rb | ||
url_test.rb |