This project is archived and is in readonly mode.

Changeset [d09a8446d5606a5a0b5c024224b09a1318e9cf4d] by rick

May 11th, 2008 @ 01:46 AM

fix merge conflict with actionpack changelog

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

Committed by Repository

  • A railties/bin/dbconsole
  • A railties/lib/commands/dbconsole.rb
  • 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/caching.rb
  • M actionpack/lib/action_controller/caching/pages.rb
  • M actionpack/lib/action_controller/polymorphic_routes.rb
  • M actionpack/lib/action_controller/record_identifier.rb
  • M actionpack/lib/action_controller/request_forgery_protection.rb
  • M actionpack/lib/action_controller/resources.rb
  • M actionpack/lib/action_controller/routing.rb
  • M actionpack/lib/action_controller/routing/segments.rb
  • M actionpack/lib/action_controller/session/active_record_store.rb
  • M actionpack/lib/action_controller/url_rewriter.rb
  • M actionpack/lib/action_view/base.rb
  • M actionpack/lib/action_view/helpers/date_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/url_helper.rb
  • M actionpack/lib/action_view/partials.rb
  • M actionpack/test/activerecord/render_partial_with_record_identification_test.rb
  • M actionpack/test/controller/new_render_test.rb
  • M actionpack/test/controller/record_identifier_test.rb
  • M actionpack/test/controller/resources_test.rb
  • M actionpack/test/controller/routing_test.rb
  • M actionpack/test/template/date_helper_test.rb
  • M activemodel/lib/active_model/validations/associated.rb
  • M activemodel/lib/active_model/validations/numericality.rb
  • M activerecord/CHANGELOG
  • M activerecord/README
  • 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/attribute_methods.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.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/fixtures.rb
  • M activerecord/lib/active_record/reflection.rb
  • M activerecord/lib/active_record/validations.rb
  • M activerecord/test/cases/adapter_test.rb
  • M activerecord/test/cases/associations/eager_test.rb
  • M activerecord/test/cases/associations_test.rb
  • M activerecord/test/cases/attribute_methods_test.rb
  • M activerecord/test/cases/finder_test.rb
  • M activerecord/test/cases/migration_test.rb
  • M activerecord/test/cases/schema_dumper_test.rb
  • M activerecord/test/models/developer.rb
  • M activerecord/test/models/post.rb
  • M activeresource/lib/active_resource/base.rb
  • M activesupport/CHANGELOG
  • M activesupport/lib/active_support/core_ext/date/calculations.rb
  • M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
  • M activesupport/lib/active_support/deprecation.rb
  • M activesupport/lib/active_support/inflector.rb
  • M activesupport/lib/active_support/time_with_zone.rb
  • M activesupport/lib/active_support/values/time_zone.rb
  • M activesupport/test/core_ext/date_ext_test.rb
  • M activesupport/test/core_ext/time_with_zone_test.rb
  • M activesupport/test/deprecation_test.rb
  • M activesupport/test/time_zone_test.rb
  • M railties/CHANGELOG
  • M railties/helpers/application.rb
  • M railties/lib/initializer.rb
  • M railties/lib/rails/plugin.rb
  • M railties/lib/rails_generator/generators/applications/app/app_generator.rb
  • M railties/lib/tasks/databases.rake

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>