diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-07-21 21:50:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-07-21 21:50:14 +0530 |
| commit | dad5446a6c6341f4e3f820c5cdde96db9cea0f7c (patch) | |
| tree | 783c5506cd62701180838e1e6792b35397b50062 /activerecord/lib/active_record/relation/spawn_methods.rb | |
| parent | db4fdb58effa7a31afc29da7a7d7fc1e1ddeff0e (diff) | |
| parent | 8fe5f01c31c489548f1648b1c3269c2d1cb5e178 (diff) | |
| download | rails-dad5446a6c6341f4e3f820c5cdde96db9cea0f7c.tar.gz rails-dad5446a6c6341f4e3f820c5cdde96db9cea0f7c.tar.bz2 rails-dad5446a6c6341f4e3f820c5cdde96db9cea0f7c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/relation/spawn_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index 80d087a9ea..d21f02cd5f 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -34,6 +34,7 @@ module ActiveRecord end end + # Like #merge, but applies changes in place. def merge!(other) klass = other.is_a?(Hash) ? Relation::HashMerger : Relation::Merger klass.new(self, other).merge |