This project is archived and is in readonly mode.

Changeset [0e2fbd80e2420329738b891240d44a056cea1de4] by Emilio Tagua

August 10th, 2009 @ 10:07 PM

Merge commit 'rails/master'

Conflicts:

activerecord/lib/active_record/calculations.rb
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

http://github.com/rails/rails/commit/0e2fbd80e2420329738b891240d44a...

Committed by Emilio Tagua

  • A actionpack/examples/views/_collection.erb
  • A actionpack/examples/views/_hello.erb
  • A actionpack/examples/views/_many_partials.erb
  • A actionpack/examples/views/_partial.erb
  • A actionpack/test/fixtures/test/greeting.xml.erb
  • A activemodel/CHANGELOG
  • A activemodel/lib/active_model/validations/with.rb
  • A activemodel/test/cases/validations/with_validation_test.rb
  • A activerecord/lib/active_record/validator.rb
  • A activerecord/test/cases/associations/habtm_join_table_test.rb
  • A activerecord/test/models/contract.rb
  • A activeresource/test/fixtures/proxy.rb
  • A activesupport/test/flush_cache_on_private_memoization_test.rb
  • M .gitignore
  • M actionmailer/test/mail_service_test.rb
  • M actionpack/CHANGELOG
  • M actionpack/examples/minimal.rb
  • M actionpack/examples/views/template.html.erb
  • M actionpack/lib/abstract_controller/helpers.rb
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/metal/compatibility.rb
  • M actionpack/lib/action_controller/metal/http_authentication.rb
  • M actionpack/lib/action_controller/routing/resources.rb
  • M actionpack/lib/action_controller/routing/route_set.rb
  • M actionpack/lib/action_dispatch/http/request.rb
  • M actionpack/lib/action_dispatch/testing/assertions/selector.rb
  • M actionpack/lib/action_view/base.rb
  • M actionpack/lib/action_view/helpers/atom_feed_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/text_helper.rb
  • M actionpack/lib/action_view/helpers/url_helper.rb
  • M actionpack/lib/action_view/render/partials.rb
  • M actionpack/lib/action_view/template/template.rb
  • M actionpack/lib/action_view/template/text.rb
  • M actionpack/test/controller/assert_select_test.rb
  • M actionpack/test/controller/caching_test.rb
  • M actionpack/test/controller/http_basic_authentication_test.rb
  • M actionpack/test/controller/http_digest_authentication_test.rb
  • M actionpack/test/controller/render_test.rb
  • M actionpack/test/controller/resources_test.rb
  • M actionpack/test/controller/routing_test.rb
  • M actionpack/test/controller/url_rewriter_test.rb
  • M actionpack/test/dispatch/request_test.rb
  • M actionpack/test/template/atom_feed_helper_test.rb
  • M actionpack/test/template/body_parts_test.rb
  • M actionpack/test/template/form_helper_test.rb
  • M actionpack/test/template/form_options_helper_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M actionpack/test/template/url_helper_test.rb
  • M activemodel/lib/active_model/validations/length.rb
  • M activemodel/test/cases/validations/length_validation_test.rb
  • M activerecord/CHANGELOG
  • M activerecord/Rakefile
  • M activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_collection.rb
  • M activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
  • M activerecord/lib/active_record/associations/has_many_association.rb
  • M activerecord/lib/active_record/associations/has_many_through_association.rb
  • M activerecord/lib/active_record/associations/has_one_through_association.rb
  • M activerecord/lib/active_record/associations/through_association_scope.rb
  • M activerecord/lib/active_record/attribute_methods/dirty.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/calculations.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/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/reflection.rb
  • M activerecord/lib/active_record/schema_dumper.rb
  • M activerecord/lib/active_record/validations/uniqueness.rb
  • M activerecord/test/cases/adapter_test.rb
  • M activerecord/test/cases/associations/belongs_to_associations_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/associations/join_model_test.rb
  • M activerecord/test/cases/base_test.rb
  • M activerecord/test/cases/calculations_test.rb
  • M activerecord/test/cases/column_definition_test.rb
  • M activerecord/test/cases/dirty_test.rb
  • M activerecord/test/cases/fixtures_test.rb
  • M activerecord/test/cases/i18n_test.rb
  • M activerecord/test/cases/migration_test.rb
  • M activerecord/test/cases/modules_test.rb
  • M activerecord/test/cases/named_scope_test.rb
  • M activerecord/test/cases/pk_test.rb
  • M activerecord/test/cases/reflection_test.rb
  • M activerecord/test/cases/schema_dumper_test.rb
  • M activerecord/test/cases/validations/uniqueness_validation_test.rb
  • M activerecord/test/fixtures/posts.yml
  • M activerecord/test/models/author.rb
  • M activerecord/test/models/comment.rb
  • M activerecord/test/models/company.rb
  • M activerecord/test/models/company_in_module.rb
  • M activerecord/test/models/organization.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 activeresource/lib/active_resource/exceptions.rb
  • M activeresource/lib/active_resource/validations.rb
  • M activeresource/test/base/load_test.rb
  • M activeresource/test/base_errors_test.rb
  • M activeresource/test/base_test.rb
  • M activeresource/test/connection_test.rb
  • M activesupport/lib/active_support/core_ext/array/conversions.rb
  • M activesupport/lib/active_support/core_ext/enumerable.rb
  • M activesupport/lib/active_support/core_ext/hash/conversions.rb
  • M activesupport/lib/active_support/core_ext/hash/deep_merge.rb
  • M activesupport/lib/active_support/core_ext/load_error.rb
  • M activesupport/lib/active_support/core_ext/time/calculations.rb
  • M activesupport/lib/active_support/deprecation/method_wrappers.rb
  • M activesupport/lib/active_support/inflector.rb
  • M activesupport/lib/active_support/json/backends/yaml.rb
  • M activesupport/lib/active_support/memoizable.rb
  • M activesupport/lib/active_support/multibyte/chars.rb
  • M activesupport/test/core_ext/array_ext_test.rb
  • M activesupport/test/core_ext/date_ext_test.rb
  • M activesupport/test/core_ext/enumerable_test.rb
  • M activesupport/test/core_ext/hash_ext_test.rb
  • M activesupport/test/core_ext/time_ext_test.rb
  • M activesupport/test/dependencies_test.rb
  • M activesupport/test/deprecation_test.rb
  • M activesupport/test/inflector_test.rb
  • M activesupport/test/isolation_test.rb
  • M activesupport/test/json/decoding_test.rb
  • M activesupport/test/multibyte_chars_test.rb
  • M railties/lib/commands/dbconsole.rb
  • M railties/lib/generators/actions.rb
  • M railties/lib/generators/active_record/model/model_generator.rb
  • M railties/lib/generators/active_record/session_migration/session_migration_generator.rb
  • M railties/lib/generators/named_base.rb
  • M railties/lib/generators/rails/app/templates/config/boot.rb
  • M railties/lib/generators/test_unit/plugin/templates/test_helper.rb
  • M railties/lib/rails/configuration.rb
  • M railties/lib/tasks/databases.rake
  • M railties/test/generators/actions_test.rb
  • M railties/test/generators/model_generator_test.rb
  • M railties/test/generators/session_migration_generator_test.rb
  • M railties/test/initializer/path_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>