This project is archived and is in readonly mode.

Changeset [0052938ac5b8894b27fdb9f27b1ed39f0a9ea176] by rick

Revision 0052938ac5b8894b27fdb9f27b1ed39f0a9ea176, committed by Repository · May 6th, 2008 @ 07:19 AM

Merge commit 'core/master'

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

169 changed files

A actionpack/test/fixtures/mascot.rb
A actionpack/test/fixtures/mascots.yml
A actionpack/test/fixtures/mascots/_mascot.html.erb
A actionpack/test/fixtures/shared.html.erb
A actionpack/test/fixtures/test/_raise.html.erb
A activerecord/test/fixtures/jobs.yml
A activerecord/test/fixtures/references.yml
A activerecord/test/fixtures/subscriptions.yml
A activerecord/test/models/job.rb
A activerecord/test/models/reference.rb
A activerecord/test/models/subscription.rb
A activesupport/lib/active_support/core_ext/process.rb
A activesupport/lib/active_support/core_ext/process/daemon.rb
A railties/test/fixtures/lib/generators/missing_class/templates/.gitignore
A railties/test/fixtures/lib/generators/missing_generator/templates/.gitignore
A railties/test/fixtures/lib/generators/missing_templates/.gitignore
A railties/test/fixtures/plugins/alternate/a/lib/.gitignore
A railties/test/fixtures/plugins/default/acts/acts_as_chunky_bacon/lib/.gitignore
A railties/test/fixtures/plugins/default/empty/.gitignore
R railties/test/fixtures/lib/generators/missing_class/templates/.empty
R railties/test/fixtures/lib/generators/missing_generator/templates/.empty
R railties/test/fixtures/lib/generators/missing_templates/.empty
R railties/test/fixtures/plugins/alternate/a/lib/.empty
R railties/test/fixtures/plugins/default/acts/acts_as_chunky_bacon/lib/.empty
R railties/test/fixtures/plugins/default/empty/.empty
M actionmailer/lib/action_mailer/base.rb
M actionpack/CHANGELOG
M actionpack/lib/action_controller/assertions/selector_assertions.rb
M actionpack/lib/action_controller/base.rb
M actionpack/lib/action_controller/cookies.rb
M actionpack/lib/action_controller/filters.rb
M actionpack/lib/action_controller/helpers.rb
M actionpack/lib/action_controller/mime_type.rb
M actionpack/lib/action_controller/polymorphic_routes.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/routing.rb
M actionpack/lib/action_controller/routing/builder.rb
M actionpack/lib/action_controller/routing/optimisations.rb
M actionpack/lib/action_controller/routing/route.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/streaming.rb
M actionpack/lib/action_controller/test_case.rb
M actionpack/lib/action_controller/test_process.rb
M actionpack/lib/action_controller/url_rewriter.rb
M actionpack/lib/action_view/base.rb
M actionpack/lib/action_view/helpers/active_record_helper.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/form_tag_helper.rb
M actionpack/lib/action_view/helpers/prototype_helper.rb
M actionpack/lib/action_view/helpers/sanitize_helper.rb
M actionpack/lib/action_view/helpers/scriptaculous_helper.rb
M actionpack/lib/action_view/helpers/url_helper.rb
M actionpack/lib/action_view/partial_template.rb
M actionpack/lib/action_view/partials.rb
M actionpack/lib/action_view/template.rb
M actionpack/lib/action_view/template_finder.rb
M actionpack/lib/action_view/template_handlers/builder.rb
M actionpack/lib/action_view/template_handlers/compilable.rb
M actionpack/lib/action_view/template_handlers/erb.rb
M actionpack/lib/action_view/template_handlers/rjs.rb
M actionpack/test/activerecord/render_partial_with_record_identification_test.rb
M actionpack/test/controller/assert_select_test.rb
M actionpack/test/controller/base_test.rb
M actionpack/test/controller/mime_type_test.rb
M actionpack/test/controller/render_test.rb
M actionpack/test/controller/routing_test.rb
M actionpack/test/controller/session/mem_cache_store_test.rb
M actionpack/test/fixtures/company.rb
M actionpack/test/fixtures/db_definitions/sqlite.sql
M actionpack/test/fixtures/reply.rb
M actionpack/test/template/benchmark_helper_test.rb
M actionpack/test/template/form_helper_test.rb
M actionpack/test/template/template_finder_test.rb
M actionpack/test/template/template_object_test.rb
M activemodel/lib/active_model/validations.rb
M activemodel/lib/active_model/validations/acceptance.rb
M activemodel/lib/active_model/validations/associated.rb
M activemodel/lib/active_model/validations/confirmation.rb
M activemodel/lib/active_model/validations/exclusion.rb
M activemodel/lib/active_model/validations/format.rb
M activemodel/lib/active_model/validations/inclusion.rb
M activemodel/lib/active_model/validations/length.rb
M activemodel/lib/active_model/validations/numericality.rb
M activemodel/lib/active_model/validations/presence.rb
M activemodel/lib/active_model/validations/uniqueness.rb
M activerecord/CHANGELOG
M activerecord/README
M activerecord/RUNNING_UNIT_TESTS
M activerecord/Rakefile
M activerecord/lib/active_record/association_preload.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/calculations.rb
M activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.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/fixtures.rb
M activerecord/lib/active_record/locking/optimistic.rb
M activerecord/lib/active_record/locking/pessimistic.rb
M activerecord/lib/active_record/migration.rb
M activerecord/lib/active_record/named_scope.rb
M activerecord/lib/active_record/reflection.rb
M activerecord/lib/active_record/serialization.rb
M activerecord/lib/active_record/serializers/json_serializer.rb
M activerecord/lib/active_record/serializers/xml_serializer.rb
M activerecord/lib/active_record/validations.rb
M activerecord/test/cases/associations/eager_test.rb
M activerecord/test/cases/associations/has_many_through_associations_test.rb
M activerecord/test/cases/base_test.rb
M activerecord/test/cases/fixtures_test.rb
M activerecord/test/cases/locking_test.rb
M activerecord/test/cases/migration_test.rb
M activerecord/test/cases/named_scope_test.rb
M activerecord/test/cases/validations_test.rb
M activerecord/test/models/person.rb
M activerecord/test/models/reply.rb
M activerecord/test/models/subscriber.rb
M activerecord/test/models/topic.rb
M activerecord/test/schema/postgresql_specific_schema.rb
M activerecord/test/schema/schema.rb
M activeresource/CHANGELOG
M activeresource/lib/active_resource/base.rb
M activeresource/lib/active_resource/connection.rb
M activesupport/CHANGELOG
M activesupport/lib/active_support/cache.rb
M activesupport/lib/active_support/cache/file_store.rb
M activesupport/lib/active_support/cache/mem_cache_store.rb
M activesupport/lib/active_support/cache/memory_store.rb
M activesupport/lib/active_support/core_ext/array/conversions.rb
M activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
M activesupport/lib/active_support/core_ext/date/calculations.rb
M activesupport/lib/active_support/core_ext/date_time/calculations.rb
M activesupport/lib/active_support/core_ext/enumerable.rb
M activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
M activesupport/lib/active_support/core_ext/kernel/daemonizing.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/range/include_range.rb
M activesupport/lib/active_support/core_ext/range/overlaps.rb
M activesupport/lib/active_support/core_ext/time/calculations.rb
M activesupport/lib/active_support/dependencies.rb
M activesupport/lib/active_support/inflector.rb
M activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
M activesupport/lib/active_support/ordered_options.rb
M activesupport/lib/active_support/time_with_zone.rb
M activesupport/lib/active_support/values/time_zone.rb
M activesupport/lib/active_support/vendor/memcache-client-1.5.0/memcache.rb
M activesupport/lib/active_support/whiny_nil.rb
M activesupport/test/inflector_test.rb
M activesupport/test/ordered_options_test.rb
M railties/CHANGELOG
M railties/lib/commands/servers/mongrel.rb
M railties/lib/initializer.rb
M railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
M railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
M railties/lib/tasks/databases.rake