This project is archived and is in readonly mode.
Changeset [3030bc90c95e335d726f06fd7a61ed96055e9109] by Yehuda Katz
Revision 3030bc90c95e335d726f06fd7a61ed96055e9109,
committed by Yehuda Katz
· January 30th, 2009 @ 07:30 PM
Merge commit 'rails/3-0-unstable'
Conflicts:
actionpack/lib/action_controller/base.rb
actionpack/lib/action_dispatch/http/mime_type.rb
actionpack/lib/action_dispatch/http/request.rb
actionpack/lib/action_view/base.rb
actionpack/lib/action_view/paths.rb
actionpack/test/controller/session/cookie_store_test.rb
actionpack/test/dispatch/rack_test.rb
actionpack/test/dispatch/request_test.rb
202 changed files
-
M
.gitignore -
M
actionmailer/lib/action_mailer/base.rb -
M
actionmailer/test/mail_service_test.rb -
M
actionpack/Rakefile -
M
actionpack/lib/action_controller.rb -
M
actionpack/lib/action_controller/assertions/dom_assertions.rb -
M
actionpack/lib/action_controller/assertions/model_assertions.rb -
M
actionpack/lib/action_controller/assertions/response_assertions.rb -
M
actionpack/lib/action_controller/assertions/routing_assertions.rb -
M
actionpack/lib/action_controller/assertions/selector_assertions.rb -
M
actionpack/lib/action_controller/assertions/tag_assertions.rb -
M
actionpack/lib/action_controller/base.rb -
M
actionpack/lib/action_controller/base/base.rb -
M
actionpack/lib/action_controller/base/chained/benchmarking.rb -
M
actionpack/lib/action_controller/base/chained/filters.rb -
M
actionpack/lib/action_controller/base/chained/flash.rb -
M
actionpack/lib/action_controller/base/cookies.rb -
M
actionpack/lib/action_controller/base/helpers.rb -
M
actionpack/lib/action_controller/base/http_authentication.rb -
M
actionpack/lib/action_controller/base/layout.rb -
M
actionpack/lib/action_controller/base/redirect.rb -
M
actionpack/lib/action_controller/base/render.rb -
M
actionpack/lib/action_controller/base/request_forgery_protection.rb -
M
actionpack/lib/action_controller/base/responder.rb -
M
actionpack/lib/action_controller/base/streaming.rb -
M
actionpack/lib/action_controller/base/verification.rb -
M
actionpack/lib/action_controller/benchmarking.rb -
M
actionpack/lib/action_controller/cgi/ext.rb -
M
actionpack/lib/action_controller/cgi/ext/cookie.rb -
M
actionpack/lib/action_controller/cgi/ext/query_extension.rb -
M
actionpack/lib/action_controller/cgi/ext/stdinput.rb -
M
actionpack/lib/action_controller/cgi/process.rb -
M
actionpack/lib/action_controller/cgi_ext.rb -
M
actionpack/lib/action_controller/cgi_ext/cookie.rb -
M
actionpack/lib/action_controller/cgi_ext/query_extension.rb -
M
actionpack/lib/action_controller/cgi_ext/stdinput.rb -
M
actionpack/lib/action_controller/cgi_process.rb -
M
actionpack/lib/action_controller/cookies.rb -
M
actionpack/lib/action_controller/dispatch/dispatcher.rb -
M
actionpack/lib/action_controller/dispatch/middlewares.rb -
M
actionpack/lib/action_controller/dispatch/rescue.rb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/_request_and_response.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/_trace.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/layout.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/missing_template.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/routing_error.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/template_error.erb -
M
actionpack/lib/action_controller/dispatch/templates/rescues/unknown_action.erb -
M
actionpack/lib/action_controller/dispatcher.rb -
M
actionpack/lib/action_controller/failsafe.rb -
M
actionpack/lib/action_controller/filters.rb -
M
actionpack/lib/action_controller/flash.rb -
M
actionpack/lib/action_controller/headers.rb -
M
actionpack/lib/action_controller/helpers.rb -
M
actionpack/lib/action_controller/http_authentication.rb -
M
actionpack/lib/action_controller/integration.rb -
M
actionpack/lib/action_controller/layout.rb -
M
actionpack/lib/action_controller/middleware_stack.rb -
M
actionpack/lib/action_controller/middlewares.rb -
M
actionpack/lib/action_controller/mime/responds.rb -
M
actionpack/lib/action_controller/mime_responds.rb -
M
actionpack/lib/action_controller/mime_type.rb -
M
actionpack/lib/action_controller/mime_types.rb -
M
actionpack/lib/action_controller/params_parser.rb -
M
actionpack/lib/action_controller/performance_test.rb -
M
actionpack/lib/action_controller/polymorphic_routes.rb -
M
actionpack/lib/action_controller/rack_ext.rb -
M
actionpack/lib/action_controller/rack_ext/lock.rb -
M
actionpack/lib/action_controller/rack_ext/multipart.rb -
M
actionpack/lib/action_controller/rack_ext/parse_query.rb -
M
actionpack/lib/action_controller/record_identifier.rb -
M
actionpack/lib/action_controller/request.rb -
M
actionpack/lib/action_controller/request_forgery_protection.rb -
M
actionpack/lib/action_controller/rescue.rb -
M
actionpack/lib/action_controller/resources.rb -
M
actionpack/lib/action_controller/response.rb -
M
actionpack/lib/action_controller/rewindable_input.rb -
M
actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb -
M
actionpack/lib/action_controller/routing/generation/url_rewriter.rb -
M
actionpack/lib/action_controller/routing/resources.rb -
M
actionpack/lib/action_controller/routing/route_set.rb -
M
actionpack/lib/action_controller/session/abstract_store.rb -
M
actionpack/lib/action_controller/session/cookie_store.rb -
M
actionpack/lib/action_controller/session/management.rb -
M
actionpack/lib/action_controller/session/mem_cache_store.rb -
M
actionpack/lib/action_controller/session_management.rb -
M
actionpack/lib/action_controller/status_codes.rb -
M
actionpack/lib/action_controller/streaming.rb -
M
actionpack/lib/action_controller/templates/rescues/_request_and_response.erb -
M
actionpack/lib/action_controller/templates/rescues/_trace.erb -
M
actionpack/lib/action_controller/templates/rescues/diagnostics.erb -
M
actionpack/lib/action_controller/templates/rescues/layout.erb -
M
actionpack/lib/action_controller/templates/rescues/missing_template.erb -
M
actionpack/lib/action_controller/templates/rescues/routing_error.erb -
M
actionpack/lib/action_controller/templates/rescues/template_error.erb -
M
actionpack/lib/action_controller/templates/rescues/unknown_action.erb -
M
actionpack/lib/action_controller/test_case.rb -
M
actionpack/lib/action_controller/test_process.rb -
M
actionpack/lib/action_controller/testing/assertions/dom.rb -
M
actionpack/lib/action_controller/testing/assertions/model.rb -
M
actionpack/lib/action_controller/testing/assertions/response.rb -
M
actionpack/lib/action_controller/testing/assertions/routing.rb -
M
actionpack/lib/action_controller/testing/assertions/selector.rb -
M
actionpack/lib/action_controller/testing/assertions/tag.rb -
M
actionpack/lib/action_controller/testing/integration.rb -
M
actionpack/lib/action_controller/testing/performance.rb -
M
actionpack/lib/action_controller/testing/process.rb -
M
actionpack/lib/action_controller/testing/test_case.rb -
M
actionpack/lib/action_controller/uploaded_file.rb -
M
actionpack/lib/action_controller/url_encoded_pair_parser.rb -
M
actionpack/lib/action_controller/url_rewriter.rb -
M
actionpack/lib/action_controller/verification.rb -
M
actionpack/lib/action_dispatch.rb -
M
actionpack/lib/action_dispatch/http/headers.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_dispatch/http/response.rb -
M
actionpack/lib/action_dispatch/http/status_codes.rb -
M
actionpack/lib/action_dispatch/middleware/failsafe.rb -
M
actionpack/lib/action_dispatch/middleware/params_parser.rb -
M
actionpack/lib/action_dispatch/middleware/rewindable_input.rb -
M
actionpack/lib/action_dispatch/middleware/session/abstract_store.rb -
M
actionpack/lib/action_dispatch/middleware/session/cookie_store.rb -
M
actionpack/lib/action_dispatch/middleware/session/mem_cache_store.rb -
M
actionpack/lib/action_dispatch/rack.rb -
M
actionpack/lib/action_dispatch/rack/lock.rb -
M
actionpack/lib/action_dispatch/rack/multipart.rb -
M
actionpack/lib/action_dispatch/rack/parse_query.rb -
M
actionpack/lib/action_dispatch/utils/middleware_stack.rb -
M
actionpack/lib/action_dispatch/utils/uploaded_file.rb -
M
actionpack/lib/action_dispatch/utils/url_encoded_pair_parser.rb -
M
actionpack/lib/action_view.rb -
M
actionpack/lib/action_view/base.rb -
M
actionpack/lib/action_view/helpers/prototype_helper.rb -
M
actionpack/lib/action_view/inline_template.rb -
M
actionpack/lib/action_view/partials.rb -
M
actionpack/lib/action_view/paths.rb -
M
actionpack/lib/action_view/render/partials.rb -
M
actionpack/lib/action_view/render/rendering.rb -
M
actionpack/lib/action_view/renderable.rb -
M
actionpack/lib/action_view/renderable_partial.rb -
M
actionpack/lib/action_view/template.rb -
M
actionpack/lib/action_view/template/error.rb -
M
actionpack/lib/action_view/template/handler.rb -
M
actionpack/lib/action_view/template/handlers.rb -
M
actionpack/lib/action_view/template/handlers/builder.rb -
M
actionpack/lib/action_view/template/handlers/erb.rb -
M
actionpack/lib/action_view/template/handlers/rjs.rb -
M
actionpack/lib/action_view/template/inline.rb -
M
actionpack/lib/action_view/template/partial.rb -
M
actionpack/lib/action_view/template/renderable.rb -
M
actionpack/lib/action_view/template/template.rb -
M
actionpack/lib/action_view/template_error.rb -
M
actionpack/lib/action_view/template_handler.rb -
M
actionpack/lib/action_view/template_handlers.rb -
M
actionpack/lib/action_view/template_handlers/builder.rb -
M
actionpack/lib/action_view/template_handlers/erb.rb -
M
actionpack/lib/action_view/template_handlers/rjs.rb -
M
actionpack/lib/action_view/test_case.rb -
M
actionpack/test/abstract_unit.rb -
M
actionpack/test/controller/dispatcher_test.rb -
M
actionpack/test/controller/header_test.rb -
M
actionpack/test/controller/layout_test.rb -
M
actionpack/test/controller/middleware_stack_test.rb -
M
actionpack/test/controller/mime_responds_test.rb -
M
actionpack/test/controller/mime_type_test.rb -
M
actionpack/test/controller/rack_test.rb -
M
actionpack/test/controller/render_test.rb -
M
actionpack/test/controller/request/json_params_parsing_test.rb -
M
actionpack/test/controller/request/multipart_params_parsing_test.rb -
M
actionpack/test/controller/request/query_string_parsing_test.rb -
M
actionpack/test/controller/request/url_encoded_params_parsing_test.rb -
M
actionpack/test/controller/request/xml_params_parsing_test.rb -
M
actionpack/test/controller/request_test.rb -
M
actionpack/test/controller/rescue_test.rb -
M
actionpack/test/controller/send_file_test.rb -
M
actionpack/test/controller/session/cookie_store_test.rb -
M
actionpack/test/controller/session/mem_cache_store_test.rb -
M
actionpack/test/controller/test_test.rb -
M
actionpack/test/controller/view_paths_test.rb -
M
actionpack/test/dispatch/header_test.rb -
M
actionpack/test/dispatch/middleware_stack_test.rb -
M
actionpack/test/dispatch/mime_type_test.rb -
M
actionpack/test/dispatch/rack_test.rb -
M
actionpack/test/dispatch/request/json_params_parsing_test.rb -
M
actionpack/test/dispatch/request/multipart_params_parsing_test.rb -
M
actionpack/test/dispatch/request/query_string_parsing_test.rb -
M
actionpack/test/dispatch/request/url_encoded_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/layout_tests/views/goodbye.rhtml -
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/lib/active_record/session_store.rb -
M
activesupport/lib/active_support.rb -
M
activesupport/lib/active_support/concurrent_hash.rb -
M
activesupport/lib/active_support/memoizable.rb -
M
ci/cruise_config.rb -
M
railties/lib/dispatcher.rb