This project is archived and is in readonly mode.

Changeset [223a1d9451c88800e9fcc93a726fdebec99e2650] by Jeremy Kemper

January 10th, 2009 @ 08:14 PM

Merge branch 'master' into savepoints http://github.com/rails/rails/co...

Committed by Jeremy Kemper

  • M actionmailer/CHANGELOG
  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/test/abstract_unit.rb
  • M actionmailer/test/mail_service_test.rb
  • M actionpack/CHANGELOG
  • M actionpack/Rakefile
  • M actionpack/lib/action_controller.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/base.rb
  • M actionpack/lib/action_controller/benchmarking.rb
  • M actionpack/lib/action_controller/caching.rb
  • M actionpack/lib/action_controller/caching/actions.rb
  • M actionpack/lib/action_controller/caching/pages.rb
  • M actionpack/lib/action_controller/caching/sql_cache.rb
  • M actionpack/lib/action_controller/cgi_ext.rb
  • M actionpack/lib/action_controller/cgi_ext/session.rb
  • M actionpack/lib/action_controller/cgi_process.rb
  • M actionpack/lib/action_controller/cookies.rb
  • M actionpack/lib/action_controller/dispatcher.rb
  • M actionpack/lib/action_controller/failsafe.rb
  • M actionpack/lib/action_controller/flash.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/lock.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_type.rb
  • M actionpack/lib/action_controller/polymorphic_routes.rb
  • M actionpack/lib/action_controller/rack_process.rb
  • M actionpack/lib/action_controller/request.rb
  • M actionpack/lib/action_controller/request_parser.rb
  • M actionpack/lib/action_controller/request_profiler.rb
  • M actionpack/lib/action_controller/rescue.rb
  • M actionpack/lib/action_controller/response.rb
  • M actionpack/lib/action_controller/routing/recognition_optimisation.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/active_record_store.rb
  • M actionpack/lib/action_controller/session/cookie_store.rb
  • M actionpack/lib/action_controller/session/drb_server.rb
  • M actionpack/lib/action_controller/session/drb_store.rb
  • M actionpack/lib/action_controller/session/mem_cache_store.rb
  • M actionpack/lib/action_controller/session_management.rb
  • M actionpack/lib/action_controller/streaming.rb
  • M actionpack/lib/action_controller/test_case.rb
  • M actionpack/lib/action_controller/test_process.rb
  • M actionpack/lib/action_controller/uploaded_file.rb
  • M actionpack/lib/action_controller/url_encoded_pair_parser.rb
  • M actionpack/lib/action_controller/verb_piggybacking.rb
  • M actionpack/lib/action_view/base.rb
  • M actionpack/lib/action_view/helpers/asset_tag_helper.rb
  • M actionpack/lib/action_view/helpers/benchmark_helper.rb
  • M actionpack/lib/action_view/helpers/date_helper.rb
  • M actionpack/lib/action_view/helpers/form_helper.rb
  • M actionpack/lib/action_view/helpers/form_options_helper.rb
  • M actionpack/lib/action_view/helpers/prototype_helper.rb
  • M actionpack/lib/action_view/helpers/tag_helper.rb
  • M actionpack/lib/action_view/inline_template.rb
  • M actionpack/lib/action_view/locale/en.yml
  • M actionpack/lib/action_view/partials.rb
  • M actionpack/lib/action_view/paths.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/test_case.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/addresses_render_test.rb
  • M actionpack/test/controller/assert_select_test.rb
  • M actionpack/test/controller/base_test.rb
  • M actionpack/test/controller/benchmark_test.rb
  • M actionpack/test/controller/caching_test.rb
  • M actionpack/test/controller/capture_test.rb
  • M actionpack/test/controller/content_type_test.rb
  • M actionpack/test/controller/cookie_test.rb
  • M actionpack/test/controller/dispatcher_test.rb
  • M actionpack/test/controller/filters_test.rb
  • M actionpack/test/controller/flash_test.rb
  • M actionpack/test/controller/http_digest_authentication_test.rb
  • M actionpack/test/controller/integration_test.rb
  • M actionpack/test/controller/integration_upload_test.rb
  • M actionpack/test/controller/layout_test.rb
  • M actionpack/test/controller/middleware_stack_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/xml_params_parsing_test.rb
  • M actionpack/test/controller/request_test.rb
  • M actionpack/test/controller/rescue_test.rb
  • M actionpack/test/controller/routing_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/session_fixation_test.rb
  • M actionpack/test/controller/session_management_test.rb
  • M actionpack/test/controller/webservice_test.rb
  • M actionpack/test/fixtures/multipart/hello.txt
  • M actionpack/test/template/asset_tag_helper_test.rb
  • M actionpack/test/template/benchmark_helper_test.rb
  • M actionpack/test/template/compiled_templates_test.rb
  • M actionpack/test/template/date_helper_i18n_test.rb
  • M actionpack/test/template/date_helper_test.rb
  • M actionpack/test/template/form_helper_test.rb
  • M actionpack/test/template/render_test.rb
  • M actionpack/test/view/test_case_test.rb
  • M activerecord/CHANGELOG
  • M activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/association_preload.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_collection.rb
  • M activerecord/lib/active_record/associations/association_proxy.rb
  • M activerecord/lib/active_record/associations/has_many_through_association.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
  • M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
  • M activerecord/lib/active_record/dirty.rb
  • M activerecord/lib/active_record/dynamic_scope_match.rb
  • M activerecord/lib/active_record/query_cache.rb
  • M activerecord/lib/active_record/serializers/xml_serializer.rb
  • M activerecord/lib/active_record/session_store.rb
  • M activerecord/lib/active_record/timestamp.rb
  • M activerecord/lib/active_record/transactions.rb
  • M activerecord/lib/active_record/validations.rb
  • M activerecord/test/cases/associations/cascaded_eager_loading_test.rb
  • M activerecord/test/cases/associations/eager_test.rb
  • M activerecord/test/cases/associations/has_many_associations_test.rb
  • M activerecord/test/cases/associations/has_many_through_associations_test.rb
  • M activerecord/test/cases/associations/has_one_through_associations_test.rb
  • M activerecord/test/cases/base_test.rb
  • M activerecord/test/cases/calculations_test.rb
  • M activerecord/test/cases/helper.rb
  • M activerecord/test/cases/method_scoping_test.rb
  • M activerecord/test/cases/named_scope_test.rb
  • M activerecord/test/cases/reload_models_test.rb
  • M activerecord/test/cases/repair_helper.rb
  • M activerecord/test/cases/validations_i18n_test.rb
  • M activerecord/test/cases/validations_test.rb
  • M activerecord/test/cases/xml_serialization_test.rb
  • M activerecord/test/fixtures/member_types.yml
  • M activerecord/test/fixtures/members.yml
  • M activerecord/test/fixtures/people.yml
  • M activerecord/test/models/company.rb
  • M activerecord/test/models/member.rb
  • M activerecord/test/models/member_detail.rb
  • M activerecord/test/models/member_type.rb
  • M activerecord/test/models/person.rb
  • M activerecord/test/schema/schema.rb
  • M activeresource/CHANGELOG
  • M activeresource/lib/active_resource/connection.rb
  • M activeresource/lib/active_resource/http_mock.rb
  • M activesupport/CHANGELOG
  • M activesupport/lib/active_support/buffered_logger.rb
  • M activesupport/lib/active_support/cache.rb
  • M activesupport/lib/active_support/callbacks.rb
  • M activesupport/lib/active_support/core_ext/benchmark.rb
  • M activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
  • M activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
  • M activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
  • M activesupport/lib/active_support/core_ext/hash/conversions.rb
  • M activesupport/lib/active_support/core_ext/hash/slice.rb
  • M activesupport/lib/active_support/core_ext/logger.rb
  • M activesupport/lib/active_support/core_ext/module/aliasing.rb
  • M activesupport/lib/active_support/core_ext/module/attr_accessor_with_default.rb
  • M activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
  • M activesupport/lib/active_support/core_ext/module/delegation.rb
  • M activesupport/lib/active_support/core_ext/module/synchronization.rb
  • M activesupport/lib/active_support/core_ext/object/misc.rb
  • M activesupport/lib/active_support/dependencies.rb
  • M activesupport/lib/active_support/deprecation.rb
  • M activesupport/lib/active_support/json/decoding.rb
  • M activesupport/lib/active_support/memoizable.rb
  • M activesupport/lib/active_support/multibyte/unicode_database.rb
  • M activesupport/lib/active_support/ordered_hash.rb
  • M activesupport/lib/active_support/testing/performance.rb
  • M activesupport/lib/active_support/time_with_zone.rb
  • M activesupport/lib/active_support/vendor.rb
  • M activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
  • M activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
  • M activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/exceptions.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/.gitignore
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/MIT-LICENSE
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/README.textile
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/Rakefile
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/i18n.gemspec
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/exceptions.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/test/all.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_exceptions_test.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_test.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.rb
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.yml
  • M activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb
  • M activesupport/lib/active_support/vendor/memcache-client-1.5.0.5/memcache.rb
  • M activesupport/lib/active_support/vendor/memcache-client-1.5.1/memcache.rb
  • M activesupport/test/buffered_logger_test.rb
  • M activesupport/test/callbacks_test.rb
  • M activesupport/test/core_ext/hash_ext_test.rb
  • M activesupport/test/core_ext/module_test.rb
  • M activesupport/test/core_ext/object_ext_test.rb
  • M activesupport/test/core_ext/time_with_zone_test.rb
  • M activesupport/test/json/decoding_test.rb
  • M activesupport/test/ordered_hash_test.rb
  • M ci/ci_build.rb
  • M ci/ci_setup_notes.txt
  • M ci/cruise_config.rb
  • M ci/geminstaller.yml
  • M railties/CHANGELOG
  • M railties/doc/guides/html/activerecord_validations_callbacks.html
  • M railties/doc/guides/html/finders.html
  • M railties/doc/guides/html/getting_started_with_rails.html
  • M railties/doc/guides/html/layouts_and_rendering.html
  • M railties/doc/guides/html/testing_rails_applications.html
  • M railties/doc/guides/source/activerecord_validations_callbacks.txt
  • M railties/doc/guides/source/command_line.txt
  • M railties/doc/guides/source/finders.txt
  • M railties/doc/guides/source/form_helpers.txt
  • M railties/doc/guides/source/getting_started_with_rails.txt
  • M railties/doc/guides/source/i18n.txt
  • M railties/doc/guides/source/images/i18n/demo_localized_pirate.png
  • M railties/doc/guides/source/images/i18n/demo_translated_en.png
  • M railties/doc/guides/source/images/i18n/demo_translated_pirate.png
  • M railties/doc/guides/source/images/i18n/demo_translation_missing.png
  • M railties/doc/guides/source/images/i18n/demo_untranslated.png
  • M railties/doc/guides/source/testing_rails_applications.txt
  • M railties/lib/commands/about.rb
  • M railties/lib/commands/dbconsole.rb
  • M railties/lib/commands/runner.rb
  • M railties/lib/commands/server.rb
  • M railties/lib/initializer.rb
  • M railties/lib/rails/backtrace_cleaner.rb
  • M railties/lib/rails/plugin/locator.rb
  • M railties/lib/rails/rack.rb
  • M railties/lib/rails/rack/log_tailer.rb
  • M railties/lib/rails/rack/logger.rb
  • M railties/lib/rails/rack/metal.rb
  • M railties/lib/rails_generator/commands.rb
  • M railties/lib/rails_generator/generators/applications/app/template_runner.rb
  • M railties/lib/rails_generator/generators/components/metal/USAGE
  • M railties/lib/rails_generator/generators/components/metal/metal_generator.rb
  • M railties/lib/rails_generator/generators/components/metal/templates/metal.rb
  • M railties/lib/tasks/databases.rake
  • M railties/lib/tasks/middleware.rake
  • M railties/lib/tasks/tmp.rake
  • M railties/lib/test_help.rb
  • M railties/test/console_app_test.rb
  • M railties/test/error_page_test.rb
  • M railties/test/fcgi_dispatcher_test.rb
  • M railties/test/gem_dependency_test.rb
  • M railties/test/generators/rails_template_runner_test.rb

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>