diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-11-30 10:28:49 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-11-30 10:29:46 +0000 |
| commit | c5bdf6c5aee61848bee67b307287e2f28ddca173 (patch) | |
| tree | 2dafd31f6d830aea9181a7be2354441be865ad3f /activerecord/lib/active_record/relation/spawn_methods.rb | |
| parent | e70bab2a8d43bc1b862eca08d24510410abcbb0b (diff) | |
| download | rails-c5bdf6c5aee61848bee67b307287e2f28ddca173.tar.gz rails-c5bdf6c5aee61848bee67b307287e2f28ddca173.tar.bz2 rails-c5bdf6c5aee61848bee67b307287e2f28ddca173.zip | |
Mark Relation mutators as :nodoc:
These are for internal use only and cannot be relied on as part of the
public API. See discussion on 8c2c60511beaad05a218e73c4918ab89fb1804f0.
Diffstat (limited to 'activerecord/lib/active_record/relation/spawn_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index 62dda542ab..352dee3826 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -40,8 +40,7 @@ module ActiveRecord end end - # Like #merge, but applies changes in place. - def merge!(other) + def merge!(other) # :nodoc: if !other.is_a?(Relation) && other.respond_to?(:to_proc) instance_exec(&other) else |