This project is archived and is in readonly mode.
Changeset [8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d] by Yehuda Katz
Revision 8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d,
committed by Yehuda Katz
· December 10th, 2009 @ 09:11 PM
Merge branch 'master' of github.com:rails/rails
http://github.com/rails/rails/commit/8b9275340f6845f1fd3ad8fc43d66a...
30 changed files
-
M
actionpack/lib/action_controller/metal/render_options.rb -
M
actionpack/lib/action_dispatch/routing/mapper.rb -
M
actionpack/lib/action_dispatch/routing/route_set.rb -
M
actionpack/test/abstract_unit.rb -
M
actionpack/test/activerecord/active_record_store_test.rb -
M
actionpack/test/controller/action_pack_assertions_test.rb -
M
actionpack/test/controller/base_test.rb -
M
actionpack/test/controller/caching_test.rb -
M
actionpack/test/controller/mime_responds_test.rb -
M
actionpack/test/controller/redirect_test.rb -
M
actionpack/test/controller/render_other_test.rb -
M
actionpack/test/controller/render_test.rb -
M
actionpack/test/controller/render_xml_test.rb -
M
actionpack/test/controller/test_test.rb -
M
actionpack/test/controller/url_rewriter_test.rb -
M
actionpack/test/controller/webservice_test.rb -
M
actionpack/test/dispatch/request/multipart_params_parsing_test.rb -
M
actionpack/test/dispatch/routing_test.rb -
M
actionpack/test/template/atom_feed_helper_test.rb -
M
actionpack/test/template/test_case_test.rb -
M
actionpack/test/template/url_helper_test.rb -
M
railties/lib/rails/generators/actions.rb -
M
railties/lib/rails/generators/rails/app/templates/config/routes.rb -
M
railties/lib/rails/generators/rails/resource/resource_generator.rb -
M
railties/lib/rails/generators/rails/scaffold/USAGE -
M
railties/test/fixtures/plugins/engines/engine/config/routes.rb -
M
railties/test/generators/actions_test.rb -
M
railties/test/generators/resource_generator_test.rb -
M
railties/test/generators/scaffold_generator_test.rb -
M
railties/test/rails_info_controller_test.rb