diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
| commit | cda36a0731f14b33a920bf7e32255661e06f890a (patch) | |
| tree | 79ccba37953f9fe3055503be42b1610faa6d64ad /activemodel/test/models | |
| parent | bd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff) | |
| parent | a115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff) | |
| download | rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2 rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'activemodel/test/models')
| -rw-r--r-- | activemodel/test/models/person.rb | 6 | ||||
| -rw-r--r-- | activemodel/test/models/track_back.rb | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb index d98420f900..c83d768379 100644 --- a/activemodel/test/models/person.rb +++ b/activemodel/test/models/person.rb @@ -1,5 +1,9 @@ class Person include ActiveModel::Validations + extend ActiveModel::Translation - attr_accessor :title, :karma + attr_accessor :title, :karma, :salary +end + +class Child < Person end diff --git a/activemodel/test/models/track_back.rb b/activemodel/test/models/track_back.rb new file mode 100644 index 0000000000..d137e4ff8f --- /dev/null +++ b/activemodel/test/models/track_back.rb @@ -0,0 +1,4 @@ +class Post + class TrackBack + end +end
\ No newline at end of file |