This project is archived and is in readonly mode.

Changeset [cc0b5fa9930dcc60914e21b518b3c54109243cfa] by Joshua Peek

Revision cc0b5fa9930dcc60914e21b518b3c54109243cfa, committed by Joshua Peek · January 22nd, 2009 @ 09:13 PM

Merge branch 'master' into 3-0-unstable

Conflicts:

ci/cruise_config.rb

http://github.com/rails/rails/co...

278 changed files

M .gitignore
M actionmailer/MIT-LICENSE
M actionmailer/lib/action_mailer.rb
M actionmailer/lib/action_mailer/base.rb
M actionmailer/test/abstract_unit.rb
M actionmailer/test/mail_service_test.rb
M actionmailer/test/quoting_test.rb
M actionpack/CHANGELOG
M actionpack/MIT-LICENSE
M actionpack/Rakefile
M actionpack/lib/action_controller.rb
M actionpack/lib/action_controller/assertions/selector_assertions.rb
M actionpack/lib/action_controller/base.rb
M actionpack/lib/action_controller/dispatcher.rb
M actionpack/lib/action_controller/flash.rb
M actionpack/lib/action_controller/helpers.rb
M actionpack/lib/action_controller/integration.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/params_parser.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/request.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/rewindable_input.rb
M actionpack/lib/action_controller/routing.rb
M actionpack/lib/action_controller/routing/route_set.rb
M actionpack/lib/action_controller/session/cookie_store.rb
M actionpack/lib/action_controller/session_management.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_pack.rb
M actionpack/lib/action_view.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/inline_template.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/template_handlers.rb
M actionpack/lib/action_view/test_case.rb
M actionpack/test/abstract_unit.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_authentication_test.rb
M actionpack/test/controller/http_basic_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/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/routing_test.rb
M actionpack/test/controller/send_file_test.rb
M actionpack/test/controller/session/cookie_store_test.rb
M actionpack/test/fixtures/multipart/empty
M actionpack/test/fixtures/multipart/hello.txt
M actionpack/test/fixtures/multipart/none
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_test.rb
M actionpack/test/template/render_test.rb
M activerecord/CHANGELOG
M activerecord/MIT-LICENSE
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_proxy.rb
M activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M activerecord/lib/active_record/base.rb
M activerecord/lib/active_record/calculations.rb
M activerecord/lib/active_record/callbacks.rb
M activerecord/lib/active_record/connection_adapters/abstract/database_statements.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/fixtures.rb
M activerecord/lib/active_record/locale/en.yml
M activerecord/lib/active_record/named_scope.rb
M activerecord/lib/active_record/reflection.rb
M activerecord/lib/active_record/session_store.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_and_belongs_to_many_associations_test.rb
M activerecord/test/cases/associations/has_many_associations_test.rb
M activerecord/test/cases/base_test.rb
M activerecord/test/cases/callbacks_test.rb
M activerecord/test/cases/defaults_test.rb
M activerecord/test/cases/dirty_test.rb
M activerecord/test/cases/helper.rb
M activerecord/test/cases/json_serialization_test.rb
M activerecord/test/cases/named_scope_test.rb
M activerecord/test/cases/transactions_test.rb
M activerecord/test/fixtures/people.yml
M activerecord/test/models/person.rb
M activerecord/test/schema/schema.rb
M activeresource/MIT-LICENSE
M activeresource/lib/active_resource/http_mock.rb
M activesupport/CHANGELOG
M activesupport/MIT-LICENSE
M activesupport/lib/active_support/buffered_logger.rb
M activesupport/lib/active_support/cache.rb
M activesupport/lib/active_support/cache/mem_cache_store.rb
M activesupport/lib/active_support/cache/strategy/local_cache.rb
M activesupport/lib/active_support/callbacks.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/date/conversions.rb
M activesupport/lib/active_support/core_ext/date_time/conversions.rb
M activesupport/lib/active_support/core_ext/hash/conversions.rb
M activesupport/lib/active_support/core_ext/hash/keys.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/core_ext/range/conversions.rb
M activesupport/lib/active_support/core_ext/try.rb
M activesupport/lib/active_support/deprecation.rb
M activesupport/lib/active_support/json/decoding.rb
M activesupport/lib/active_support/json/encoders/date.rb
M activesupport/lib/active_support/json/encoders/date_time.rb
M activesupport/lib/active_support/json/encoders/hash.rb
M activesupport/lib/active_support/json/encoders/time.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/test/caching_test.rb
M activesupport/test/callbacks_test.rb
M activesupport/test/core_ext/hash_ext_test.rb
M activesupport/test/core_ext/integer_ext_test.rb
M activesupport/test/core_ext/object_and_class_ext_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/json/encoding_test.rb
M activesupport/test/ordered_hash_test.rb
M railties/CHANGELOG
M railties/MIT-LICENSE
M railties/Rakefile
M railties/bin/performance/request
M railties/configs/initializers/session_store.rb
M railties/doc/README_FOR_APP
M railties/doc/guides/html/2_2_release_notes.html
M railties/doc/guides/html/action_mailer_basics.html
M railties/doc/guides/html/actioncontroller_basics.html
M railties/doc/guides/html/active_record_querying.html
M railties/doc/guides/html/activerecord_validations_callbacks.html
M railties/doc/guides/html/association_basics.html
M railties/doc/guides/html/authors.html
M railties/doc/guides/html/benchmarking_and_profiling.html
M railties/doc/guides/html/caching_with_rails.html
M railties/doc/guides/html/command_line.html
M railties/doc/guides/html/configuring.html
M railties/doc/guides/html/creating_plugins.html
M railties/doc/guides/html/debugging_rails_applications.html
M railties/doc/guides/html/finders.html
M railties/doc/guides/html/form_helpers.html
M railties/doc/guides/html/getting_started_with_rails.html
M railties/doc/guides/html/i18n.html
M railties/doc/guides/html/index.html
M railties/doc/guides/html/layouts_and_rendering.html
M railties/doc/guides/html/migrations.html
M railties/doc/guides/html/performance_testing.html
M railties/doc/guides/html/rails_on_rack.html
M railties/doc/guides/html/routing_outside_in.html
M railties/doc/guides/html/security.html
M railties/doc/guides/html/testing_rails_applications.html
M railties/doc/guides/source/action_mailer_basics.txt
M railties/doc/guides/source/actioncontroller_basics/session.txt
M railties/doc/guides/source/active_record_basics.txt
M railties/doc/guides/source/active_record_querying.txt
M railties/doc/guides/source/activerecord_validations_callbacks.txt
M railties/doc/guides/source/authors.txt
M railties/doc/guides/source/benchmarking_and_profiling/appendix.txt
M railties/doc/guides/source/benchmarking_and_profiling/digging_deeper.txt
M railties/doc/guides/source/benchmarking_and_profiling/edge_rails_features.txt
M railties/doc/guides/source/benchmarking_and_profiling/gameplan.txt
M railties/doc/guides/source/benchmarking_and_profiling/index.txt
M railties/doc/guides/source/benchmarking_and_profiling/rubyprof.txt
M railties/doc/guides/source/benchmarking_and_profiling/statistics.txt
M railties/doc/guides/source/caching_with_rails.txt
M railties/doc/guides/source/command_line.txt
M railties/doc/guides/source/configuring.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/customized_error_messages.png
M railties/doc/guides/source/images/error_messages.png
M railties/doc/guides/source/images/validation_error_messages.png
M railties/doc/guides/source/index.txt
M railties/doc/guides/source/layouts_and_rendering.txt
M railties/doc/guides/source/performance_testing.txt
M railties/doc/guides/source/rails_on_rack.txt
M railties/doc/guides/source/routing_outside_in.txt
M railties/doc/guides/source/security.txt
M railties/doc/guides/source/stylesheets/base.css
M railties/doc/guides/source/stylesheets/forms.css
M railties/doc/guides/source/stylesheets/more.css
M railties/doc/guides/source/templates/guides.html.erb
M railties/doc/guides/source/templates/inline.css
M railties/doc/guides/source/testing_rails_applications.txt
M railties/lib/commands/performance/request.rb
M railties/lib/dispatcher.rb
M railties/lib/initializer.rb
M railties/lib/rails/backtrace_cleaner.rb
M railties/lib/rails_generator/commands.rb
M railties/lib/rails_generator/generators/applications/app/app_generator.rb
M railties/lib/rails_generator/generators/applications/app/template_runner.rb
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