index
:
rails.git
3-2-stable-for-hmno
master
Mirror of official rails repo with custom fixes.
Harald Eilertsen
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
activerecord
/
lib
/
active_record
/
relation
/
merger.rb
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fix merge error when Equality LHS is non-attribute
Ernie Miller
2012-08-17
1
-2
/
+5
*
load active_support/core_ext/object/blank in active_support/rails
Xavier Noria
2012-08-02
1
-1
/
+0
*
Add nodoc to HashMerger and Merger
Oscar Del Ben
2012-07-17
1
-2
/
+2
*
Relation#from to accept other Relation objects
Radoslav Stankov
2012-05-17
1
-1
/
+2
*
Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...
Jon Leighton
2012-05-05
1
-28
/
+3
*
Allow ActiveRecord::Relation merges to maintain context of joined associations
Jared Armstrong
2012-05-04
1
-3
/
+28
*
fix interpolation for hash merging
Jon Leighton
2012-04-25
1
-15
/
+24
*
allow merging a single where value
Jon Leighton
2012-04-25
1
-1
/
+1
*
now we can just manipulate the values hash in #only and #except
Jon Leighton
2012-04-13
1
-10
/
+1
*
remove apply_finder_options call from AssociationScope
Jon Leighton
2012-04-13
1
-1
/
+1
*
Make Relation#extending work like other value methods
Jon Leighton
2012-04-13
1
-3
/
+1
*
assert valid keys
Jon Leighton
2012-04-13
1
-0
/
+5
*
Allow Relation#merge to take a hash
Jon Leighton
2012-04-13
1
-44
/
+69
*
we have no need for the ASSOCIATION_METHODS constant
Jon Leighton
2012-04-13
1
-1
/
+1
*
refactoring
Jon Leighton
2012-04-13
1
-36
/
+45
*
Extract clusterfuck method for surgery
Jon Leighton
2012-04-13
1
-0
/
+84