Merge remote-tracking branch 'parent/main' into upstream-20240403

2024-04-03 12:12:09 +09:00 · 2024-04-03 12:12:09 +09:00 · 479c4fecc1
commit 479c4fecc1
parent 8c399cefce 4233ee1f59
63 changed files with 831 additions and 391 deletions
--- a/app/serializers/rest/poll_serializer.rb
+++ b/app/serializers/rest/poll_serializer.rb
@ -1,6 +1,8 @@
 # frozen_string_literal: true

 class REST::PollSerializer < ActiveModel::Serializer
+  # Please update `app/javascript/mastodon/api_types/polls.ts` when making changes to the attributes
+
  attributes :id, :expires_at, :expired,
             :multiple, :votes_count, :voters_count