Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

This project is archived and is in readonly mode.

Changeset [fa5f7f7087aed5acdd225b10dc39fd53ed12eea8] by José Valim

Revision fa5f7f7087aed5acdd225b10dc39fd53ed12eea8, committed by José Valim · July 15th, 2009 @ 11:28 PM

Merge branch 'master' of git://github.com/rails/rails http://github.com/rails/rails/co...

6 changed files

  • M activerecord/lib/active_record/associations.rb
  • M activerecord/test/cases/associations/has_many_through_associations_test.rb
  • M activesupport/lib/active_support/core_ext/hash/deep_merge.rb
  • M activesupport/lib/active_support/core_ext/hash/diff.rb
  • M activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
  • M activesupport/lib/active_support/hash_with_indifferent_access.rb