diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 19:32:09 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 19:32:09 -0700 |
| commit | c09a5ffea7780a0f940f3f963c892f0ae1316802 (patch) | |
| tree | e5908025ddccf62dc183f6e6ced4d87bf265b28a /activerecord/lib/active_record/associations/has_many_through_association.rb | |
| parent | a9f9ae385e2145b7f0d1ae43a7b66ed280b220b9 (diff) | |
| parent | 6eee1dd62c85e23d84f16e8f300d8aba77bd5c64 (diff) | |
| download | rails-c09a5ffea7780a0f940f3f963c892f0ae1316802.tar.gz rails-c09a5ffea7780a0f940f3f963c892f0ae1316802.tar.bz2 rails-c09a5ffea7780a0f940f3f963c892f0ae1316802.zip | |
Merge branch 'arel'
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_through_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 829f0ac0c5..214ce5959a 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -56,7 +56,7 @@ module ActiveRecord options[:joins] = construct_joins(options[:joins]) options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil? && @reflection.source_reflection.options[:include] end - + def insert_record(record, force = true, validate = true) if record.new_record? if force |