rails

mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00

Files

Jon Leighton 735844db71 Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
	activerecord/lib/active_record/associations/has_one_through_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb
	activerecord/lib/active_record/reflection.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activerecord/test/cases/associations/has_one_through_associations_test.rb
	activerecord/test/cases/reflection_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/fixtures/memberships.yml
	activerecord/test/models/categorization.rb
	activerecord/test/models/category.rb
	activerecord/test/models/member.rb
	activerecord/test/models/reference.rb
	activerecord/test/models/tagging.rb

2011-03-04 09:30:27 +00:00

locale

Remove weak_passwords list and the length/strong password validator, leave that up to the programmer

2010-12-19 15:01:29 -02:00

mass_assignment_security

Add missing require to use Set

2010-07-11 02:55:47 -03:00

serializers

copy-edits 34316d8

2011-02-21 11:00:03 +01:00

validations

Merge branch 'master' of git://github.com/lifo/docrails