1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activemodel/lib/active_model
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 2011-02-21 11:42:26 +01:00
attribute_methods.rb Merge branch 'master' into nested_has_many_through 2011-03-04 09:30:27 +00:00
callbacks.rb Use run_callbacks; the generated _run_<name>_callbacks method is not a public interface. 2011-01-31 19:45:53 -02:00
conversion.rb to_key should return all exists keys (if any exists), regardless if the object is persisted or not. If you need it to reflect persistance, you should use to_param. 2010-08-15 11:29:15 -03:00
dirty.rb Remove require AS::Concern from places where is already in 2010-12-19 19:15:26 -02:00
errors.rb Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]" 2011-02-27 21:30:03 -02:00
lint.rb Move ActiveModel::Lint::Tests documentation to be above module declaration so it appears in the API docs for this module. 2010-12-09 18:16:18 +10:00
mass_assignment_security.rb Properly indent code example block 2011-01-15 17:54:02 +01:00
naming.rb Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]" 2011-02-27 21:30:03 -02:00
observing.rb copy-edits 6d7a826 2011-02-21 11:01:26 +01:00
railtie.rb Some railties cleanup: 2009-12-31 13:12:52 -08:00
secure_password.rb Override attributes_protected_by_default when has_secure_password is called. 2011-02-09 18:35:15 -02:00
serialization.rb Fixed broken, memoized attributes method example 2011-02-07 14:44:37 -02:00
test_case.rb Autoload AS test case 2010-01-04 16:22:46 -06:00
translation.rb Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]" 2011-02-27 21:30:03 -02:00
validations.rb copy-edits 8d96b89 2011-02-21 11:37:08 +01:00
validator.rb Tiny fixes to rdoc 2010-09-16 17:10:36 +04:00
version.rb Update the version.rb files to include a PRE part 2010-11-16 17:19:46 -08:00