diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-11-30 10:28:16 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-11-30 10:28:16 +0000 |
| commit | 079ac4a0584b24625266a0e9448503d1b96c2b7f (patch) | |
| tree | 6a28edeb393cd095de252335f9e3c9cec7c78d13 /activerecord/test/models/ship.rb | |
| parent | bd9ffa7e1fb433f359ee096a2afd924a652d1912 (diff) | |
| parent | 6874133f9e5ca79f30f43632da4338d7b82ddeff (diff) | |
| download | rails-079ac4a0584b24625266a0e9448503d1b96c2b7f.tar.gz rails-079ac4a0584b24625266a0e9448503d1b96c2b7f.tar.bz2 rails-079ac4a0584b24625266a0e9448503d1b96c2b7f.zip | |
Merge branch 'master' of github.com:rails/rails
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 77a4728d0b..5f618a50d2 100644 --- a/activerecord/test/models/ship.rb +++ b/activerecord/test/models/ship.rb @@ -6,7 +6,7 @@ class Ship < ActiveRecord::Base has_many :parts, :class_name => 'ShipPart' accepts_nested_attributes_for :parts, :allow_destroy => true - accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc { |attributes| attributes.empty? } + accepts_nested_attributes_for :pirate, :allow_destroy => true, :reject_if => proc(&:empty?) accepts_nested_attributes_for :update_only_pirate, :update_only => true validates_presence_of :name |