diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-11-08 16:03:15 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-11-08 16:03:15 -0600 |
| commit | c10f4ae01d91d1afc90b21d4bba51e59ae9a0625 (patch) | |
| tree | 67c0428c4a31452227bca75ba835a642bd01fd41 /activerecord/test/models/pirate.rb | |
| parent | a595abff211eee97d75c51c085cfdc821b1edb46 (diff) | |
| parent | f125a34501e21b1e0da2b80d149df7a739482804 (diff) | |
| download | rails-c10f4ae01d91d1afc90b21d4bba51e59ae9a0625.tar.gz rails-c10f4ae01d91d1afc90b21d4bba51e59ae9a0625.tar.bz2 rails-c10f4ae01d91d1afc90b21d4bba51e59ae9a0625.zip | |
Merge remote branch 'Fingertips/master'
Diffstat (limited to 'activerecord/test/models/pirate.rb')
| -rw-r--r-- | activerecord/test/models/pirate.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/models/pirate.rb b/activerecord/test/models/pirate.rb index 05c5b666ae..f2c05dd48f 100644 --- a/activerecord/test/models/pirate.rb +++ b/activerecord/test/models/pirate.rb @@ -18,7 +18,7 @@ class Pirate < ActiveRecord::Base has_many :treasure_estimates, :through => :treasures, :source => :price_estimates # These both have :autosave enabled because accepts_nested_attributes_for is used on them. - has_one :ship, :validate => true + has_one :ship has_one :non_validated_ship, :class_name => 'Ship' has_many :birds has_many :birds_with_method_callbacks, :class_name => "Bird", |