Merge commit 'c15c8c7aa8' into kb_migration

2023-06-01 17:30:18 +09:00 · 2023-06-01 17:30:18 +09:00 · 093cfdbb7b
commit 093cfdbb7b
parent e3cc989954 c15c8c7aa8
208 changed files with 2976 additions and 5888 deletions
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@ -345,9 +345,10 @@ export const translateStatusFail = (id, error) => ({
  error,
 });

-export const undoStatusTranslation = id => ({
+export const undoStatusTranslation = (id, pollId) => ({
  type: STATUS_TRANSLATE_UNDO,
  id,
+  pollId,
 });

 export const updateEmojiReaction = (emoji_reaction) => ({