diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:29:18 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:29:18 +0200 |
| commit | 919eb200a9a0969c444b938d08eb4661d41ba986 (patch) | |
| tree | 329cbe815d549275cc0dc6aa0f75c18d8954f105 /activemodel/test/models/contact.rb | |
| parent | 56669ec3048de316918ec5ad554fff83d757911b (diff) | |
| parent | b456877cfb7e0cb0bab9ffd5674abd23caba0ab4 (diff) | |
| download | rails-919eb200a9a0969c444b938d08eb4661d41ba986.tar.gz rails-919eb200a9a0969c444b938d08eb4661d41ba986.tar.bz2 rails-919eb200a9a0969c444b938d08eb4661d41ba986.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activemodel/test/models/contact.rb')
| -rw-r--r-- | activemodel/test/models/contact.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/test/models/contact.rb b/activemodel/test/models/contact.rb index 605e435f39..f4f3078473 100644 --- a/activemodel/test/models/contact.rb +++ b/activemodel/test/models/contact.rb @@ -1,4 +1,5 @@ class Contact + extend ActiveModel::Naming include ActiveModel::Conversion attr_accessor :id, :name, :age, :created_at, :awesome, :preferences |