diff options
| author | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
| commit | 10c581a6deed66e8b62de6e7a3621a63de90baad (patch) | |
| tree | 588ceb1118761602caa8ccf248dd08d59f33896c /activerecord/test/models/developer.rb | |
| parent | 64637da284ed4685591c178202ee103e6bee71cf (diff) | |
| parent | 81025b5808886289f54d698f73f4199c99223e7e (diff) | |
| download | rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.gz rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.bz2 rails-10c581a6deed66e8b62de6e7a3621a63de90baad.zip | |
fix merge
Diffstat (limited to 'activerecord/test/models/developer.rb')
| -rw-r--r-- | activerecord/test/models/developer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb index f77fd0e96d..9f26cacdec 100644 --- a/activerecord/test/models/developer.rb +++ b/activerecord/test/models/developer.rb @@ -56,7 +56,8 @@ class Developer < ActiveRecord::Base end class AuditLog < ActiveRecord::Base - belongs_to :developer + belongs_to :developer, :validate => true + belongs_to :unvalidated_developer, :class_name => 'Developer' end DeveloperSalary = Struct.new(:amount) |