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

2022-05-26 18:34:27 +02:00
parent 444b650094 088dc0ec5a
commit f13d910f3e
29 changed files with 833 additions and 369 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -511,7 +511,7 @@ class Status < ApplicationRecord
  end

  def set_poll_id
-    update_column(:poll_id, poll.id) unless poll.nil?
+    update_column(:poll_id, poll.id) if association(:poll).loaded? && poll.present?
  end

  def set_visibility