diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-13 02:17:45 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-13 02:17:45 -0700 |
| commit | 9d214636919883dac6b491812f576d3b916116c1 (patch) | |
| tree | 5297baddadf9d96e5cf0aab545f465f056d00eac /activerecord | |
| parent | 3af7b16c114802acdf0c0e7a34837a7a454fd23f (diff) | |
| parent | 9f85c41eec2ffcb2477bd4d66854d168634c5eaf (diff) | |
| download | rails-9d214636919883dac6b491812f576d3b916116c1.tar.gz rails-9d214636919883dac6b491812f576d3b916116c1.tar.bz2 rails-9d214636919883dac6b491812f576d3b916116c1.zip | |
Merge pull request #11414 from ankit8898/typo
Typo fix [skip ci]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 6d047e0331..f5d668dae8 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -109,7 +109,7 @@ module ActiveRecord # override any order specified in the original relation relation.reorder! values[:order] elsif values[:order] - # merge in order_values from r + # merge in order_values from relation relation.order! values[:order] end |