Fix failing tests. Replace ruby to 2.1.1 in travis. Update travis config

This commit is contained in:
KalabiYau 2014-04-24 22:02:50 +02:00
parent eacdd9cfd6
commit a6031df9f2
4 changed files with 65 additions and 54 deletions

View file

@ -6,7 +6,7 @@ class Person < ActiveRecord::Base
belongs_to :user, :inverse_of => :person
has_many :event_people, :dependent => :destroy
has_many :events, :through => :event_people, :uniq => true
has_many :events, -> { uniq }, :through => :event_people
has_many :registrations, :dependent => :destroy
has_many :votes, :dependent => :destroy
has_many :voted_events, :through => :votes, :source => :events