aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-12-09 11:13:00 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-09 11:13:00 -0800
commit3cbf5d9794cc49783fcbcb160cdd908981ee8f84 (patch)
treed27294e02e44cc9475495aa3a24b05410d487bc6 /activerecord/lib/active_record
parentbba3dacc3dc6ac379209f2eda0da5d2dd93d6b04 (diff)
downloadrails-3cbf5d9794cc49783fcbcb160cdd908981ee8f84.tar.gz
rails-3cbf5d9794cc49783fcbcb160cdd908981ee8f84.tar.bz2
rails-3cbf5d9794cc49783fcbcb160cdd908981ee8f84.zip
removing useless lasgn
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
index b063d927b9..024ce4114b 100644
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
@@ -136,7 +136,7 @@ module ActiveRecord
conditions << process_conditions(options[:conditions], aliased_table_name)
end
- relation = relation.on(*conditions)
+ relation.on(*conditions)
end
def join_has_and_belongs_to_many_to(relation)