aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/developer.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-20 16:59:00 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-20 16:59:00 -0600
commit0ebe8e580520b41a5957099868973bcdec5ab7e5 (patch)
treebe9d7d97069165f2f9a3a72e56195599efd03a09 /activerecord/test/models/developer.rb
parentd94ae72a5259c31ea510e6341bbbf4e920312ebe (diff)
parent5c32f41d5258743500345db34839a21139676f8e (diff)
downloadrails-0ebe8e580520b41a5957099868973bcdec5ab7e5.tar.gz
rails-0ebe8e580520b41a5957099868973bcdec5ab7e5.tar.bz2
rails-0ebe8e580520b41a5957099868973bcdec5ab7e5.zip
Merge pull request #19938 from vngrs/join_dependency_instantiate_bug
Fix for activerecord join dependency instantiate bug
Diffstat (limited to 'activerecord/test/models/developer.rb')
-rw-r--r--activerecord/test/models/developer.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 7c5941b1af..9a907273f8 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -15,6 +15,8 @@ class Developer < ActiveRecord::Base
end
end
+ belongs_to :mentor
+
accepts_nested_attributes_for :projects
has_and_belongs_to_many :shared_computers, class_name: "Computer"