Merge branch 'master' into glitch-soc/merge-upstream

2019-03-13 21:35:43 +01:00
parent 3005e473a0 65d9004ac9
commit 5ffdc5426e
9 changed files with 129 additions and 23 deletions
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -26,6 +26,8 @@ class Poll < ApplicationRecord

  has_many :votes, class_name: 'PollVote', inverse_of: :poll, dependent: :destroy

+  has_many :notifications, as: :activity, dependent: :destroy
+
  validates :options, presence: true
  validates :expires_at, presence: true, if: :local?
  validates_with PollValidator, on: :create, if: :local?