From 2a07db716957bf1638a84aa3c1f69d26efdbdb7d Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Wed, 10 Apr 2013 21:07:48 -0300 Subject: Remove warning warning: `*' interpreted as argument prefix --- activerecord/lib/active_record/relation/merger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/relation') diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index c7f3b88534..936b83261e 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -78,7 +78,7 @@ module ActiveRecord return if values[:joins].blank? if other.klass == relation.klass - relation.joins! *values[:joins] + relation.joins!(*values[:joins]) else joins_dependency, rest = values[:joins].partition do |join| case join @@ -89,7 +89,7 @@ module ActiveRecord end end - join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass, + join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass, joins_dependency, []) relation.joins! rest -- cgit v1.2.3