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/ship.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/ship.rb')
| -rw-r--r-- | activerecord/test/models/ship.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/models/ship.rb b/activerecord/test/models/ship.rb index d0df951622..06759d64b8 100644 --- a/activerecord/test/models/ship.rb +++ b/activerecord/test/models/ship.rb @@ -1,7 +1,7 @@ class Ship < ActiveRecord::Base self.record_timestamps = false - belongs_to :pirate, :validate => true + belongs_to :pirate has_many :parts, :class_name => 'ShipPart', :autosave => true accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } |