mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
735844db71
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 |
||
---|---|---|
.. | ||
locale | ||
mass_assignment_security | ||
serializers | ||
validations | ||
attribute_methods.rb | ||
callbacks.rb | ||
conversion.rb | ||
dirty.rb | ||
errors.rb | ||
lint.rb | ||
mass_assignment_security.rb | ||
naming.rb | ||
observing.rb | ||
railtie.rb | ||
secure_password.rb | ||
serialization.rb | ||
test_case.rb | ||
translation.rb | ||
validations.rb | ||
validator.rb | ||
version.rb |