This project is archived and is in readonly mode.

Changeset [fa8849a573aa98750fc5fdacf557d973b85072ca] by David Heinemeier Hansson

Revision fa8849a573aa98750fc5fdacf557d973b85072ca, committed by David Heinemeier Hansson · December 21st, 2009 @ 07:28 PM

Merge branch 'master' of github.com:rails/rails
http://github.com/rails/rails/commit/fa8849a573aa98750fc5fdacf557d9...

54 changed files

A actionpack/lib/abstract_controller/rendering.rb
A actionpack/lib/action_controller/metal/rack_delegation.rb
A actionpack/lib/action_controller/metal/redirecting.rb
A actionpack/lib/action_controller/metal/renderers.rb
A actionpack/lib/action_controller/metal/rendering.rb
A activeresource/lib/active_resource/schema.rb
A activeresource/test/cases/base/schema_test.rb
R actionpack/lib/abstract_controller/rendering_controller.rb
R actionpack/lib/action_controller/metal/rack_convenience.rb
R actionpack/lib/action_controller/metal/redirector.rb
R actionpack/lib/action_controller/metal/render_options.rb
R actionpack/lib/action_controller/metal/rendering_controller.rb
R actionpack/lib/action_controller/metal/session.rb
R actionpack/lib/action_dispatch/http/utils.rb
M actionmailer/lib/action_mailer/base.rb
M actionpack/CHANGELOG
M actionpack/lib/abstract_controller.rb
M actionpack/lib/abstract_controller/base.rb
M actionpack/lib/abstract_controller/helpers.rb
M actionpack/lib/abstract_controller/layouts.rb
M actionpack/lib/action_controller.rb
M actionpack/lib/action_controller/base.rb
M actionpack/lib/action_controller/metal.rb
M actionpack/lib/action_controller/metal/conditional_get.rb
M actionpack/lib/action_controller/metal/cookies.rb
M actionpack/lib/action_controller/metal/flash.rb
M actionpack/lib/action_controller/metal/head.rb
M actionpack/lib/action_controller/metal/layouts.rb
M actionpack/lib/action_controller/metal/request_forgery_protection.rb
M actionpack/lib/action_controller/metal/streaming.rb
M actionpack/lib/action_controller/metal/testing.rb
M actionpack/lib/action_controller/metal/url_for.rb
M actionpack/lib/action_controller/metal/verification.rb
M actionpack/lib/action_dispatch.rb
M actionpack/lib/action_dispatch/http/request.rb
M actionpack/lib/action_dispatch/http/response.rb
M actionpack/lib/action_dispatch/http/status_codes.rb
M actionpack/lib/action_dispatch/middleware/params_parser.rb
M actionpack/lib/action_dispatch/routing/mapper.rb
M actionpack/lib/action_view.rb
M actionpack/test/abstract/abstract_controller_test.rb
M actionpack/test/abstract/helper_test.rb
M actionpack/test/abstract/layouts_test.rb
M actionpack/test/abstract/localized_cache_test.rb
M actionpack/test/abstract/render_test.rb
M actionpack/test/dispatch/routing_test.rb
M activeresource/lib/active_resource.rb
M activeresource/lib/active_resource/base.rb
M activesupport/lib/active_support/core_ext/date/calculations.rb
M activesupport/lib/active_support/core_ext/date/conversions.rb
M activesupport/lib/active_support/core_ext/time/calculations.rb
M activesupport/lib/active_support/ruby/shim.rb
M railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
M railties/lib/rails/generators/rails/app/templates/config/routes.rb