This project is archived and is in readonly mode.
Changeset [c01c8967a02537f132d437d5ae15332982119651] by Emilio Tagua
August 17th, 2009 @ 11:46 PM
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
http://github.com/rails/rails/commit/c01c8967a02537f132d437d5ae1533...
Committed by Emilio Tagua
- A actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb
- R actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.rhtml
- R actionpack/test/fixtures/test/using_layout_around_block_with_args.html.erb
- M actionpack/lib/abstract_controller/layouts.rb
- M actionpack/lib/abstract_controller/rendering_controller.rb
- M actionpack/lib/action_controller/metal/rendering_controller.rb
- M actionpack/lib/action_controller/routing/resources.rb
- M actionpack/lib/action_controller/routing/route_set.rb
- M actionpack/lib/action_controller/testing/process.rb
- M actionpack/lib/action_dispatch/http/request.rb
- M actionpack/lib/action_dispatch/middleware/params_parser.rb
- M actionpack/lib/action_view/base.rb
- M actionpack/lib/action_view/helpers/prototype_helper.rb
- M actionpack/lib/action_view/render/partials.rb
- M actionpack/lib/action_view/render/rendering.rb
- M actionpack/lib/action_view/template/handler.rb
- M actionpack/lib/action_view/template/resolver.rb
- M actionpack/lib/action_view/template/template.rb
- M actionpack/test/controller/content_type_test.rb
- M actionpack/test/controller/mime_responds_test.rb
- M actionpack/test/controller/render_js_test.rb
- M actionpack/test/controller/render_test.rb
- M actionpack/test/controller/routing_test.rb
- M actionpack/test/dispatch/mime_type_test.rb
- M actionpack/test/dispatch/request/json_params_parsing_test.rb
- M actionpack/test/dispatch/request/xml_params_parsing_test.rb
- M actionpack/test/dispatch/request_test.rb
- M actionpack/test/fixtures/test/_customer_with_var.erb
- M actionpack/test/fixtures/test/_hash_object.erb
- M actionpack/test/lib/fixture_template.rb
- M actionpack/test/new_base/content_type_test.rb
- M actionpack/test/new_base/render_layout_test.rb
- M actionpack/test/new_base/render_rjs_test.rb
- M actionpack/test/new_base/render_template_test.rb
- M actionpack/test/template/javascript_helper_test.rb
- M actionpack/test/template/prototype_helper_test.rb
- M actionpack/test/template/render_test.rb
- M activerecord/Rakefile
- M activerecord/test/cases/associations/join_model_test.rb
- M activeresource/test/base/load_test.rb
- M activesupport/test/isolation_test.rb
- M ci/geminstaller.yml
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
<h2 style="font-size: 14px">Tickets have moved to Github</h2>
The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>