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

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

Browse Source 
Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.
This commit is contained in:
Thibaut Girka
2020-04-12 16:50:27 +02:00
parent 51bbf0b68d 490ff09c5a
commit fdd0beefa7
17 changed files with 247 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/workers/post_process_media_worker.rb
View File

@@ -25,7 +25,7 @@ class PostProcessMediaWorker
media_attachment = MediaAttachment.find(media_attachment_id)
media_attachment.processing = :in_progress
media_attachment.save
media_attachment.file.reprocess_original!
media_attachment.file.reprocess!(:original)
media_attachment.processing = :complete
media_attachment.save
rescue ActiveRecord::RecordNotFound