aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
Commit message (Expand)AuthorAgeFilesLines
* load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-021-1/+0
* Add nodoc to HashMerger and MergerOscar Del Ben2012-07-171-2/+2
* Relation#from to accept other Relation objectsRadoslav Stankov2012-05-171-1/+2
* Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-051-28/+3
* Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-041-3/+28
* fix interpolation for hash mergingJon Leighton2012-04-251-15/+24
* allow merging a single where valueJon Leighton2012-04-251-1/+1
* now we can just manipulate the values hash in #only and #exceptJon Leighton2012-04-131-10/+1
* remove apply_finder_options call from AssociationScopeJon Leighton2012-04-131-1/+1
* Make Relation#extending work like other value methodsJon Leighton2012-04-131-3/+1
* assert valid keysJon Leighton2012-04-131-0/+5
* Allow Relation#merge to take a hashJon Leighton2012-04-131-44/+69
* we have no need for the ASSOCIATION_METHODS constantJon Leighton2012-04-131-1/+1
* refactoringJon Leighton2012-04-131-36/+45
* Extract clusterfuck method for surgeryJon Leighton2012-04-131-0/+84