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 [4dc2521028140d005b0871ab5d8b02694dbf58c3] by Xavier Noria

Revision 4dc2521028140d005b0871ab5d8b02694dbf58c3, committed by Xavier Noria · August 3rd, 2010 @ 01:15 AM

Merge remote branch 'docrails/master' into 3-0-stable
http://github.com/rails/rails/commit/4dc2521028140d005b0871ab5d8b02...

26 changed files

  • M activerecord/lib/active_record/aggregations.rb
  • M activerecord/lib/active_record/association_preload.rb
  • 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/associations/has_many_through_association.rb
  • M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
  • M activerecord/lib/active_record/attribute_methods/write.rb
  • M activerecord/lib/active_record/autosave_association.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/callbacks.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.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/dynamic_finder_match.rb
  • M activerecord/lib/active_record/errors.rb
  • M activerecord/lib/active_record/fixtures.rb
  • M activerecord/lib/active_record/named_scope.rb
  • M activerecord/lib/active_record/observer.rb
  • M activerecord/lib/active_record/persistence.rb
  • M activerecord/lib/active_record/relation.rb
  • M activerecord/lib/active_record/relation/calculations.rb
  • M activerecord/lib/active_record/relation/finder_methods.rb
  • M activerecord/lib/active_record/timestamp.rb
  • M activerecord/lib/active_record/validations/associated.rb
  • M activerecord/lib/active_record/validations/uniqueness.rb