diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
| commit | 9887f238871bb2dd73de6ce8855615bcc5d8d079 (patch) | |
| tree | 74fa9ff9524a51701cfa23f708b3f777c65b7fe5 /activerecord/test/models/minivan.rb | |
| parent | aff821508a16245ebc03510ba29c70379718dfb7 (diff) | |
| parent | 5214e73850916de3c9127d35a4ecee0424d364a3 (diff) | |
| download | rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.gz rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.bz2 rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.zip | |
Merge branch 'master' of https://github.com/rails/rails
Diffstat (limited to 'activerecord/test/models/minivan.rb')
| -rw-r--r-- | activerecord/test/models/minivan.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/models/minivan.rb b/activerecord/test/models/minivan.rb index 602438d16f..830cdb5796 100644 --- a/activerecord/test/models/minivan.rb +++ b/activerecord/test/models/minivan.rb @@ -1,9 +1,9 @@ class Minivan < ActiveRecord::Base set_primary_key :minivan_id - + belongs_to :speedometer has_one :dashboard, :through => :speedometer - + attr_readonly :color end |