Skip to content
Browse files

Remove the assignment for real this time.

cc:
a11e2fc#commitcomment-6353614
and 0369dbf

Conflicts:
	activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
  • Loading branch information...
1 parent 47a60ea commit 928a0c65e0a2864cb249ae7c82e576113ae578cc @zzak zzak committed May 16, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
View
4 activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -25,8 +25,8 @@ def self.build(lhs_class, name, options)
class_name = options.fetch(:class_name) {
model_name = name.to_s.camelize.singularize
- if parent_name = lhs_class.parent_name
- model_name = model_name.prepend("#{parent_name}::")
+ if lhs_class.parent_name
+ model_name.prepend("#{lhs_class.parent_name}::")
end
model_name

0 comments on commit 928a0c6

Please sign in to comment.
Something went wrong with that request. Please try again.