aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAnkit Gupta <ankit.gupta8898@gmail.com>2013-07-12 21:29:31 +0100
committerAnkit Gupta <ankit.gupta8898@gmail.com>2013-07-12 21:29:31 +0100
commit9f85c41eec2ffcb2477bd4d66854d168634c5eaf (patch)
tree5297baddadf9d96e5cf0aab545f465f056d00eac /activerecord
parent3af7b16c114802acdf0c0e7a34837a7a454fd23f (diff)
downloadrails-9f85c41eec2ffcb2477bd4d66854d168634c5eaf.tar.gz
rails-9f85c41eec2ffcb2477bd4d66854d168634c5eaf.tar.bz2
rails-9f85c41eec2ffcb2477bd4d66854d168634c5eaf.zip
Typo fix [skip ci]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/relation/merger.rb2
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