Merge master

This commit is contained in:
Michael Ball 2020-06-02 01:59:54 -07:00
commit 0b9b100bf3
11 changed files with 58 additions and 40 deletions

View file

@ -4,6 +4,8 @@ class Vote < ApplicationRecord
belongs_to :user
belongs_to :event
validates :user_id, uniqueness: { scope: :event_id }
has_paper_trail ignore: [:updated_at], meta: { conference_id: :conference_id }
delegate :name, to: :user