From 9f85c41eec2ffcb2477bd4d66854d168634c5eaf Mon Sep 17 00:00:00 2001 From: Ankit Gupta <ankit.gupta8898@gmail.com> Date: Fri, 12 Jul 2013 21:29:31 +0100 Subject: Typo fix [skip ci] --- activerecord/lib/active_record/relation/merger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') 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 -- cgit v1.2.3