diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
| commit | 4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (patch) | |
| tree | d2bd733be55a75d5aab8fbcfc4adbb83034980bc /activerecord/lib | |
| parent | 97716e6273018c5531c7c927d226af823a0a3820 (diff) | |
| parent | 0626668374d092a3cf72b16fe24944beffddf804 (diff) | |
| download | rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.gz rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.bz2 rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 3e68f973e7..cec876149c 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -382,7 +382,7 @@ module ActiveRecord persisted.map! do |record| # Unfortunately we cannot simply do memory.delete(record) since on 1.8 this returns - # record rather than memory.at(memory.index(record)). The behaviour is fixed in 1.9. + # record rather than memory.at(memory.index(record)). The behavior is fixed in 1.9. mem_index = memory.index(record) if mem_index |