aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-04-10 21:07:48 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-04-10 21:09:45 -0300
commit2a07db716957bf1638a84aa3c1f69d26efdbdb7d (patch)
tree03153c93f98fb4e232a24941f60a43ff2afbc7c5 /activerecord/lib/active_record/relation/merger.rb
parentc0163cc5f2410224c45073dcf388ef19bfc672d9 (diff)
downloadrails-2a07db716957bf1638a84aa3c1f69d26efdbdb7d.tar.gz
rails-2a07db716957bf1638a84aa3c1f69d26efdbdb7d.tar.bz2
rails-2a07db716957bf1638a84aa3c1f69d26efdbdb7d.zip
Remove warning
warning: `*' interpreted as argument prefix
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
-rw-r--r--activerecord/lib/active_record/relation/merger.rb4
1 files changed, 2 insertions, 2 deletions
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