diff options
author | Thiago Pinto <tapgyn@gmail.com> | 2013-08-14 02:02:38 -0400 |
---|---|---|
committer | Thiago Pinto <tapgyn@gmail.com> | 2013-08-14 02:02:38 -0400 |
commit | 70d6e16fbad75b89dd1798ed697e7732b8606fa3 (patch) | |
tree | be55dfa9e84cfd72313b4233bbe9262b8d764124 /activerecord/test/models/member.rb | |
parent | ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9 (diff) | |
parent | abc75f027337863cca1167372447872e1c6f1339 (diff) | |
download | rails-70d6e16fbad75b89dd1798ed697e7732b8606fa3.tar.gz rails-70d6e16fbad75b89dd1798ed697e7732b8606fa3.tar.bz2 rails-70d6e16fbad75b89dd1798ed697e7732b8606fa3.zip |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/test/models/member.rb')
-rw-r--r-- | activerecord/test/models/member.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/models/member.rb b/activerecord/test/models/member.rb index cc47c7bc18..72095f9236 100644 --- a/activerecord/test/models/member.rb +++ b/activerecord/test/models/member.rb @@ -2,7 +2,6 @@ class Member < ActiveRecord::Base has_one :current_membership has_one :selected_membership has_one :membership - has_many :fellow_members, :through => :club, :source => :members has_one :club, :through => :current_membership has_one :selected_club, :through => :selected_membership, :source => :club has_one :favourite_club, -> { where "memberships.favourite = ?", true }, :through => :membership, :source => :club |