TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove warning

Browse Source 
warning: `*' interpreted as argument prefix
This commit is contained in:
Carlos Antonio da Silva 2013-04-10 21:07:48 -03:00
parent c0163cc5f2
commit 2a07db7169
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/relation/merger.rb
View File

@ -78,7 +78,7 @@ def merge_joins
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 @@ def merge_joins
end
end
join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass,
join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass,
joins_dependency,
[])
relation.joins! rest