This project is archived and is in readonly mode.

Changeset [e566fc0577f336be35145b815f3fd0a554eab564] by José Valim

Revision e566fc0577f336be35145b815f3fd0a554eab564, committed by José Valim · July 29th, 2009 @ 08:22 PM

Merge branch 'master' of git://github.com/rails/rails http://github.com/rails/rails/co...

M actionpack/lib/action_controller/base/mime_responds.rb
M actionpack/lib/action_controller/base/renderer.rb
M actionpack/lib/action_dispatch/http/mime_type.rb
M actionpack/lib/action_dispatch/http/mime_types.rb
M actionpack/lib/action_dispatch/http/request.rb
M actionpack/lib/action_view/helpers/active_model_helper.rb
M actionpack/test/controller/mime_responds_test.rb
M actionpack/test/dispatch/request_test.rb
M actionpack/test/fixtures/respond_with/using_defaults.html.erb
M actionpack/test/fixtures/respond_with/using_defaults.js.rjs
M actionpack/test/fixtures/respond_with/using_defaults_with_type_list.js.rjs
M actionpack/test/fixtures/respond_with/using_defaults_with_type_list.xml.builder
M actionpack/test/fixtures/respond_with/using_resource.html.erb
M actionpack/test/template/active_record_helper_i18n_test.rb
M actionpack/test/template/active_record_helper_test.rb
M activemodel/lib/active_model/naming.rb