This project is archived and is in readonly mode.

Changeset [fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90] by Emilio Tagua

June 2nd, 2009 @ 04:36 PM

Merge commit 'rails/master'

Conflicts:

activerecord/lib/active_record.rb

http://github.com/rails/rails/commit/fd3c55f09fdfb45c33a5383af2c0b9...

Committed by Emilio Tagua

  • A actionpack/lib/action_controller/new_base/rack_convenience.rb
  • A actionpack/test/fixtures/test/utf8_magic.html.erb
  • A activemodel/lib/active_model/locale/en.yml
  • A activemodel/lib/active_model/test_case.rb
  • A activemodel/lib/active_model/validations_repair_helper.rb
  • A activemodel/test/cases/helper.rb
  • A activemodel/test/cases/observing_test.rb
  • A activemodel/test/cases/state_machine/event_test.rb
  • A activemodel/test/cases/state_machine/machine_test.rb
  • A activemodel/test/cases/state_machine/state_test.rb
  • A activemodel/test/cases/state_machine/state_transition_test.rb
  • A activemodel/test/cases/state_machine_test.rb
  • A activemodel/test/cases/tests_database.rb
  • A activemodel/test/cases/validations/acceptance_validation_test.rb
  • A activemodel/test/cases/validations/conditional_validation_test.rb
  • A activemodel/test/cases/validations/confirmation_validation_test.rb
  • A activemodel/test/cases/validations/exclusion_validation_test.rb
  • A activemodel/test/cases/validations/format_validation_test.rb
  • A activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
  • A activemodel/test/cases/validations/i18n_validation_test.rb
  • A activemodel/test/cases/validations/inclusion_validation_test.rb
  • A activemodel/test/cases/validations/length_validation_test.rb
  • A activemodel/test/cases/validations/numericality_validation_test.rb
  • A activemodel/test/cases/validations/presence_validation_test.rb
  • A activemodel/test/cases/validations_test.rb
  • A activemodel/test/config.rb
  • A activemodel/test/fixtures/topics.yml
  • A activemodel/test/models/developer.rb
  • A activemodel/test/models/person.rb
  • A activemodel/test/models/reply.rb
  • A activemodel/test/models/topic.rb
  • A activemodel/test/schema.rb
  • A activerecord/lib/active_record/validations/associated.rb
  • A activerecord/lib/active_record/validations/uniqueness.rb
  • A activerecord/test/cases/validations/association_validation_test.rb
  • A activerecord/test/cases/validations/i18n_generate_message_validation_test.rb
  • A activerecord/test/cases/validations/i18n_validation_test.rb
  • A activerecord/test/cases/validations/uniqueness_validation_test.rb
  • A activesupport/lib/active_support/concern.rb
  • A activesupport/test/concern_test.rb
  • A railties/lib/rails_generator/generators/components/model_subclass/USAGE
  • A railties/lib/rails_generator/generators/components/model_subclass/model_subclass_generator.rb
  • A railties/lib/rails_generator/generators/components/model_subclass/templates/model.rb
  • A railties/lib/rails_generator/generators/components/model_subclass/templates/unit_test.rb
  • A railties/test/generators/rails_model_subclass_generator_test.rb
  • A tools/profile
  • R activemodel/lib/active_model/callbacks.rb
  • R activemodel/lib/active_model/core.rb
  • R activemodel/lib/active_model/validations/associated.rb
  • R activemodel/lib/active_model/validations/uniqueness.rb
  • R activemodel/test/observing_test.rb
  • R activemodel/test/state_machine/event_test.rb
  • R activemodel/test/state_machine/machine_test.rb
  • R activemodel/test/state_machine/state_test.rb
  • R activemodel/test/state_machine/state_transition_test.rb
  • R activemodel/test/state_machine_test.rb
  • R activemodel/test/test_helper.rb
  • R activerecord/test/cases/validations_i18n_test.rb
  • R activesupport/test/dependency_module_test.rb
  • R tools/profile_requires
  • M .gitignore
  • M actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb
  • M actionmailer/test/mail_service_test.rb
  • M actionpack/CHANGELOG
  • M actionpack/Rakefile
  • M actionpack/examples/minimal.rb
  • M actionpack/lib/action_controller/abstract/base.rb
  • M actionpack/lib/action_controller/abstract/benchmarker.rb
  • M actionpack/lib/action_controller/abstract/callbacks.rb
  • M actionpack/lib/action_controller/abstract/exceptions.rb
  • M actionpack/lib/action_controller/abstract/helpers.rb
  • M actionpack/lib/action_controller/abstract/layouts.rb
  • M actionpack/lib/action_controller/abstract/logger.rb
  • M actionpack/lib/action_controller/abstract/renderer.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/filter_parameter_logging.rb
  • M actionpack/lib/action_controller/base/helpers.rb
  • M actionpack/lib/action_controller/base/request_forgery_protection.rb
  • M actionpack/lib/action_controller/base/streaming.rb
  • M actionpack/lib/action_controller/base/verification.rb
  • M actionpack/lib/action_controller/caching.rb
  • M actionpack/lib/action_controller/caching/actions.rb
  • M actionpack/lib/action_controller/new_base.rb
  • M actionpack/lib/action_controller/new_base/base.rb
  • M actionpack/lib/action_controller/new_base/compatibility.rb
  • M actionpack/lib/action_controller/new_base/conditional_get.rb
  • M actionpack/lib/action_controller/new_base/helpers.rb
  • M actionpack/lib/action_controller/new_base/hide_actions.rb
  • M actionpack/lib/action_controller/new_base/http.rb
  • M actionpack/lib/action_controller/new_base/layouts.rb
  • M actionpack/lib/action_controller/new_base/redirector.rb
  • M actionpack/lib/action_controller/new_base/render_options.rb
  • M actionpack/lib/action_controller/new_base/renderer.rb
  • M actionpack/lib/action_controller/new_base/rescuable.rb
  • M actionpack/lib/action_controller/new_base/session.rb
  • M actionpack/lib/action_controller/new_base/testing.rb
  • M actionpack/lib/action_controller/new_base/url_for.rb
  • M actionpack/lib/action_controller/routing/resources.rb
  • M actionpack/lib/action_controller/routing/segments.rb
  • M actionpack/lib/action_controller/testing/integration.rb
  • M actionpack/lib/action_controller/testing/process2.rb
  • M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
  • M actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  • M actionpack/lib/action_dispatch/testing/assertions/routing.rb
  • M actionpack/lib/action_view/helpers/capture_helper.rb
  • M actionpack/lib/action_view/helpers/form_tag_helper.rb
  • M actionpack/lib/action_view/render/partials.rb
  • M actionpack/lib/action_view/template/handlers/erb.rb
  • M actionpack/lib/action_view/template/template.rb
  • M actionpack/test/controller/cookie_test.rb
  • M actionpack/test/controller/filters_test.rb
  • M actionpack/test/controller/flash_test.rb
  • M actionpack/test/controller/routing_test.rb
  • M actionpack/test/controller/view_paths_test.rb
  • M actionpack/test/dispatch/show_exceptions_test.rb
  • M actionpack/test/fixtures/test/utf8.html.erb
  • M actionpack/test/template/body_parts_test.rb
  • M actionpack/test/template/form_tag_helper_test.rb
  • M actionpack/test/template/output_buffer_test.rb
  • M actionpack/test/template/render_test.rb
  • M activemodel/Rakefile
  • M activemodel/lib/active_model.rb
  • M activemodel/lib/active_model/deprecated_error_methods.rb
  • M activemodel/lib/active_model/errors.rb
  • M activemodel/lib/active_model/observing.rb
  • M activemodel/lib/active_model/state_machine.rb
  • M activemodel/lib/active_model/validations.rb
  • M activemodel/lib/active_model/validations/acceptance.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 activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/aggregations.rb
  • M activerecord/lib/active_record/association_preload.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/attribute_methods.rb
  • M activerecord/lib/active_record/autosave_association.rb
  • M activerecord/lib/active_record/batches.rb
  • M activerecord/lib/active_record/calculations.rb
  • M activerecord/lib/active_record/callbacks.rb
  • M activerecord/lib/active_record/dirty.rb
  • M activerecord/lib/active_record/fixtures.rb
  • M activerecord/lib/active_record/locking/optimistic.rb
  • M activerecord/lib/active_record/named_scope.rb
  • M activerecord/lib/active_record/nested_attributes.rb
  • M activerecord/lib/active_record/observer.rb
  • M activerecord/lib/active_record/reflection.rb
  • M activerecord/lib/active_record/schema_dumper.rb
  • M activerecord/lib/active_record/serializers/json_serializer.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/eager_load_nested_include_test.rb
  • M activerecord/test/cases/associations/has_one_associations_test.rb
  • M activerecord/test/cases/autosave_association_test.rb
  • M activerecord/test/cases/helper.rb
  • M activerecord/test/cases/repair_helper.rb
  • M activerecord/test/cases/schema_dumper_test.rb
  • M activerecord/test/cases/validations_test.rb
  • M activerecord/test/models/company.rb
  • M activerecord/test/models/company_in_module.rb
  • M activerecord/test/models/reply.rb
  • M activerecord/test/schema/schema.rb
  • M activeresource/lib/active_resource.rb
  • M activeresource/lib/active_resource/base.rb
  • M activeresource/lib/active_resource/validations.rb
  • M activeresource/test/base_errors_test.rb
  • M activesupport/lib/active_support/autoload.rb
  • M activesupport/lib/active_support/cache/strategy/local_cache.rb
  • M activesupport/lib/active_support/dependency_module.rb
  • M activesupport/lib/active_support/new_callbacks.rb
  • M activesupport/test/caching_test.rb
  • M railties/CHANGELOG
  • M railties/lib/commands/server.rb
  • M railties/lib/initializer.rb
  • M railties/lib/tasks/databases.rake
  • M railties/test/initializer_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>