This project is archived and is in readonly mode.

Changeset [39e4e76d15233bb1cb0b778d920f54efe86bb4f0] by Emilio Tagua

September 1st, 2009 @ 07:45 PM

Merge commit 'rails/master'

Conflicts:

activerecord/lib/active_record/associations.rb

http://github.com/rails/rails/commit/39e4e76d15233bb1cb0b778d920f54...

Committed by Emilio Tagua

  • A actionmailer/actionmailer.gemspec
  • A actionpack/actionpack.gemspec
  • A activemodel/MIT-LICENSE
  • A activemodel/activemodel.gemspec
  • A activemodel/lib/active_model/lint.rb
  • A activemodel/lib/active_model/version.rb
  • A activemodel/test/cases/lint_test.rb
  • A activerecord/activerecord.gemspec
  • A activeresource/activeresource.gemspec
  • A activesupport/activesupport.gemspec
  • A railties/lib/generators/erb/scaffold/templates/_form.html.erb
  • A railties/lib/generators/resource_helpers.rb
  • A railties/lib/vendor/thor-0.11.6/CHANGELOG.rdoc
  • A railties/lib/vendor/thor-0.11.6/LICENSE
  • A railties/lib/vendor/thor-0.11.6/README.rdoc
  • A railties/lib/vendor/thor-0.11.6/bin/rake2thor
  • A railties/lib/vendor/thor-0.11.6/bin/thor
  • A railties/lib/vendor/thor-0.11.6/lib/thor.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/actions.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/actions/create_file.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/actions/directory.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/actions/empty_directory.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/actions/file_manipulation.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/actions/inject_into_file.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/base.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/hash_with_indifferent_access.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/core_ext/ordered_hash.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/error.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/group.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/invocation.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/parser.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/parser/argument.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/parser/arguments.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/parser/option.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/parser/options.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/rake_compat.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/runner.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/shell.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/shell/basic.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/shell/color.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/task.rb
  • A railties/lib/vendor/thor-0.11.6/lib/thor/util.rb
  • A railties/rails.gemspec
  • A railties/test/fixtures/plugins/engines/engine/config/locales/en.yml
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/adapter/camping.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/abstract/handler.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/abstract/request.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/basic.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/digest/md5.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/digest/nonce.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/digest/params.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/digest/request.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/auth/openid.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/builder.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/cascade.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/chunked.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/commonlogger.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/conditionalget.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/content_length.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/content_type.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/deflater.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/directory.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/file.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/cgi.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/evented_mongrel.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/fastcgi.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/lsws.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/mongrel.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/scgi.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/swiftiplied_mongrel.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/thin.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/handler/webrick.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/head.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/lint.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/lobster.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/lock.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/methodoverride.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/mime.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/mock.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/recursive.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/reloader.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/request.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/response.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/rewindable_input.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/session/abstract/id.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/session/cookie.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/session/memcache.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/session/pool.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/showexceptions.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/showstatus.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/static.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/urlmap.rb
  • R actionpack/lib/action_dispatch/vendor/rack-1.1.pre/rack/utils.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/mock_session.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/test.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/test/cookie_jar.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/test/methods.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/test/mock_digest_request.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/test/uploaded_file.rb
  • R actionpack/lib/action_dispatch/vendor/rack-test/rack/test/utils.rb
  • R railties/lib/vendor/thor-0.11.5/CHANGELOG.rdoc
  • R railties/lib/vendor/thor-0.11.5/LICENSE
  • R railties/lib/vendor/thor-0.11.5/README.rdoc
  • R railties/lib/vendor/thor-0.11.5/bin/rake2thor
  • R railties/lib/vendor/thor-0.11.5/bin/thor
  • R railties/lib/vendor/thor-0.11.5/lib/thor.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/actions.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/actions/create_file.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/actions/directory.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/actions/empty_directory.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/actions/file_manipulation.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/actions/inject_into_file.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/base.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/core_ext/hash_with_indifferent_access.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/core_ext/ordered_hash.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/error.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/group.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/invocation.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/parser.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/parser/argument.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/parser/arguments.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/parser/option.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/parser/options.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/rake_compat.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/runner.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/shell.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/shell/basic.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/shell/color.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/task.rb
  • R railties/lib/vendor/thor-0.11.5/lib/thor/util.rb
  • M Rakefile
  • M actionmailer/Rakefile
  • M actionpack/Rakefile
  • M actionpack/lib/action_controller.rb
  • M actionpack/lib/action_controller/metal/mime_responds.rb
  • M actionpack/lib/action_controller/metal/responder.rb
  • M actionpack/lib/action_controller/testing/integration.rb
  • M actionpack/lib/action_controller/testing/process.rb
  • M actionpack/lib/action_dispatch.rb
  • M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
  • M actionpack/test/abstract_unit.rb
  • M actionpack/test/controller/mime_responds_test.rb
  • M actionpack/test/dispatch/test_request_test.rb
  • M actionpack/test/new_base/test_helper.rb
  • M actionpack/test/old_base/abstract_unit.rb
  • M activemodel/Rakefile
  • M activemodel/lib/active_model.rb
  • M activemodel/lib/active_model/dirty.rb
  • M activemodel/lib/active_model/validations/numericality.rb
  • M activemodel/test/cases/validations/numericality_validation_test.rb
  • M activerecord/Rakefile
  • 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/attribute_methods/dirty.rb
  • M activerecord/test/cases/associations/habtm_join_table_test.rb
  • M activerecord/test/cases/dirty_test.rb
  • M activerecord/test/fixtures/edges.yml
  • M activerecord/test/schema/schema.rb
  • M activeresource/Rakefile
  • M activesupport/Rakefile
  • M activesupport/lib/active_support/core_ext/date/calculations.rb
  • M activesupport/test/core_ext/date_ext_test.rb
  • M ci/ci_setup_notes.txt
  • M ci/cruise_config.rb
  • M ci/geminstaller.yml
  • M railties/CHANGELOG
  • M railties/Rakefile
  • M railties/builtin/rails_info/rails/info.rb
  • M railties/lib/generators.rb
  • M railties/lib/generators/actions.rb
  • M railties/lib/generators/base.rb
  • M railties/lib/generators/erb/scaffold/scaffold_generator.rb
  • M railties/lib/generators/erb/scaffold/templates/edit.html.erb
  • M railties/lib/generators/erb/scaffold/templates/layout.html.erb
  • M railties/lib/generators/erb/scaffold/templates/new.html.erb
  • M railties/lib/generators/named_base.rb
  • M railties/lib/generators/rails/generator/generator_generator.rb
  • M railties/lib/generators/rails/resource/resource_generator.rb
  • M railties/lib/generators/rails/scaffold/scaffold_generator.rb
  • M railties/lib/generators/rails/scaffold_controller/scaffold_controller_generator.rb
  • M railties/lib/generators/rails/stylesheets/templates/scaffold.css
  • M railties/lib/generators/test_unit/scaffold/scaffold_generator.rb
  • M railties/lib/rails/configuration.rb
  • M railties/lib/rails/plugin.rb
  • M railties/lib/rails/plugin/loader.rb
  • M railties/lib/tasks/databases.rake
  • M railties/test/abstract_unit.rb
  • M railties/test/generators/scaffold_generator_test.rb
  • M railties/test/initializer/test_helper.rb
  • M railties/test/initializer_test.rb
  • M railties/test/plugin_loader_test.rb
  • M railties/test/rails_info_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>