This project is archived and is in readonly mode.

Changeset [670281c6b2e9b9e8c51a140f2a5f66b251f1b84b] by Emilio Tagua

September 8th, 2009 @ 07:38 PM

Merge commit 'rails/master'

Conflicts:

activerecord/lib/active_record/associations.rb

http://github.com/rails/rails/commit/670281c6b2e9b9e8c51a140f2a5f66...

Committed by Emilio Tagua

  • A actionpack/test/new_base/content_negotiation_test.rb
  • A activesupport/lib/active_support/multibyte/utils.rb
  • A activesupport/test/multibyte_utils_test.rb
  • A railties/lib/vendor/bundler/README.markdown
  • A railties/lib/vendor/bundler/lib/bundler/commands/bundle_command.rb
  • A railties/lib/vendor/bundler/lib/bundler/commands/exec_command.rb
  • A railties/lib/vendor/bundler/lib/bundler/dsl.rb
  • A railties/lib/vendor/bundler/lib/bundler/environment.rb
  • A railties/lib/vendor/bundler/lib/bundler/gem_ext.rb
  • A railties/lib/vendor/bundler/lib/bundler/repository.rb
  • A railties/lib/vendor/bundler/lib/bundler/repository/directory_repository.rb
  • A railties/lib/vendor/bundler/lib/bundler/repository/gem_repository.rb
  • A railties/lib/vendor/bundler/lib/bundler/source.rb
  • A railties/lib/vendor/bundler/lib/bundler/templates/app_script.erb
  • A railties/lib/vendor/bundler/lib/bundler/templates/environment.erb
  • R activerecord/test/cases/class_inheritable_attributes_test.rb
  • R railties/lib/vendor/bundler/bin/gem_bundler
  • R railties/lib/vendor/bundler/lib/bundler/gem_specification.rb
  • R railties/lib/vendor/bundler/lib/bundler/installer.rb
  • R railties/lib/vendor/bundler/lib/bundler/manifest.rb
  • R railties/lib/vendor/bundler/lib/bundler/resolver/builders.rb
  • R railties/lib/vendor/bundler/lib/bundler/resolver/engine.rb
  • R railties/lib/vendor/bundler/lib/bundler/resolver/inspect.rb
  • R railties/lib/vendor/bundler/lib/bundler/resolver/search.rb
  • R railties/lib/vendor/bundler/lib/bundler/resolver/stack.rb
  • R railties/lib/vendor/bundler/lib/bundler/resolver/state.rb
  • M .gitignore
  • M actionmailer/actionmailer.gemspec
  • M actionmailer/lib/action_mailer/base.rb
  • M actionpack/Rakefile
  • M actionpack/actionpack.gemspec
  • M actionpack/lib/abstract_controller/layouts.rb
  • M actionpack/lib/abstract_controller/rendering_controller.rb
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/legacy/layout.rb
  • M actionpack/lib/action_controller/testing/process.rb
  • M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
  • M actionpack/lib/action_view.rb
  • M actionpack/lib/action_view/helpers/asset_tag_helper.rb
  • M actionpack/lib/action_view/helpers/tag_helper.rb
  • M actionpack/lib/action_view/template/resolver.rb
  • M actionpack/test/abstract_controller/abstract_controller_test.rb
  • M actionpack/test/activerecord/active_record_store_test.rb
  • M actionpack/test/controller/action_pack_assertions_test.rb
  • M actionpack/test/controller/addresses_render_test.rb
  • M actionpack/test/controller/integration_test.rb
  • M actionpack/test/controller/routing_test.rb
  • M actionpack/test/controller/url_rewriter_test.rb
  • M actionpack/test/controller/view_paths_test.rb
  • M actionpack/test/dispatch/session/cookie_store_test.rb
  • M actionpack/test/lib/controller/fake_controllers.rb
  • M actionpack/test/lib/fixture_template.rb
  • M actionpack/test/new_base/render_file_test.rb
  • M actionpack/test/template/asset_tag_helper_test.rb
  • M actionpack/test/template/compiled_templates_test.rb
  • M actionpack/test/template/url_helper_test.rb
  • M activemodel/Rakefile
  • M activemodel/activemodel.gemspec
  • M activemodel/lib/active_model/attribute_methods.rb
  • M activemodel/lib/active_model/observing.rb
  • M activemodel/lib/active_model/validations_repair_helper.rb
  • M activemodel/test/cases/observing_test.rb
  • M activemodel/test/cases/serializeration/json_serialization_test.rb
  • M activemodel/test/cases/serializeration/xml_serialization_test.rb
  • M activemodel/test/cases/validations/i18n_validation_test.rb
  • M activemodel/test/cases/validations/presence_validation_test.rb
  • M activemodel/test/cases/validations/with_validation_test.rb
  • M activerecord/Rakefile
  • M activerecord/activerecord.gemspec
  • M activerecord/lib/active_record/associations.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/callbacks.rb
  • M activerecord/test/cases/associations/habtm_join_table_test.rb
  • M activerecord/test/fixtures/edges.yml
  • M activerecord/test/schema/schema.rb
  • M activeresource/Rakefile
  • M activeresource/activeresource.gemspec
  • M activeresource/lib/active_resource/observing.rb
  • M activeresource/test/cases/observing_test.rb
  • M activeresource/test/cases/validations_test.rb
  • M activesupport/Rakefile
  • M activesupport/activesupport.gemspec
  • M activesupport/lib/active_support/message_verifier.rb
  • M activesupport/lib/active_support/multibyte.rb
  • M activesupport/lib/active_support/multibyte/chars.rb
  • M activesupport/test/core_ext/boolean_ext_test.rb
  • M activesupport/test/core_ext/nil_ext_test.rb
  • M activesupport/test/core_ext/object_ext_test.rb
  • M activesupport/test/core_ext/regexp_ext_test.rb
  • M railties/Rakefile
  • M railties/lib/test_help.rb
  • M railties/lib/vendor/bundler/Rakefile
  • M railties/lib/vendor/bundler/lib/bundler.rb
  • M railties/lib/vendor/bundler/lib/bundler/cli.rb
  • M railties/lib/vendor/bundler/lib/bundler/dependency.rb
  • M railties/lib/vendor/bundler/lib/bundler/finder.rb
  • M railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb
  • M railties/lib/vendor/bundler/lib/bundler/resolver.rb
  • M railties/lib/vendor/bundler/lib/bundler/runtime.rb
  • M railties/rails.gemspec

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>