tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-05-25 22:59:30 +02:00
parent ad1098970b 4a22e72b9b
commit 2e02d03524
48 changed files with 1232 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/workers/post_process_media_worker.rb
View File

@ -24,7 +24,7 @@ class PostProcessMediaWorker
media_attachment.processing = :in_progress
media_attachment.save
# Because paperclip-av-transcover overwrites this attribute
# Because paperclip-av-transcoder overwrites this attribute
# we will save it here and restore it after reprocess is done
previous_meta = media_attachment.file_meta