diff options
| author | Olli Jokinen <olli.jokinen@enemy.fi> | 2011-12-01 15:32:59 +0200 |
|---|---|---|
| committer | Olli Jokinen <olli.jokinen@enemy.fi> | 2011-12-01 15:32:59 +0200 |
| commit | b4e1903d23a760028d58bc3bb20a1d491bfd4a4b (patch) | |
| tree | a40bdce1bd4800124ab6eaed2a6be017bf9cfd3d /activerecord/test/models/author.rb | |
| parent | fae9ad9c712decef70b379f5aa1faa0149902831 (diff) | |
| parent | 1e51cd957e3c90f4be35f1f0c4c380d8f7d40d66 (diff) | |
| download | rails-b4e1903d23a760028d58bc3bb20a1d491bfd4a4b.tar.gz rails-b4e1903d23a760028d58bc3bb20a1d491bfd4a4b.tar.bz2 rails-b4e1903d23a760028d58bc3bb20a1d491bfd4a4b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'activerecord/test/models/author.rb')
| -rw-r--r-- | activerecord/test/models/author.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb index 23db5650d4..bfadfd9d75 100644 --- a/activerecord/test/models/author.rb +++ b/activerecord/test/models/author.rb @@ -128,7 +128,6 @@ class Author < ActiveRecord::Base belongs_to :author_address, :dependent => :destroy belongs_to :author_address_extra, :dependent => :delete, :class_name => "AuthorAddress" - has_many :post_categories, :through => :posts, :source => :categories has_many :category_post_comments, :through => :categories, :source => :post_comments has_many :misc_posts, :class_name => 'Post', |