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:
- `.env.production.sample`:
  Upstream changed it completely.
  Changed ours to merge upstream's new structure, but
  keeping most of the information.
This commit is contained in:
Thibaut Girka
2020-07-05 19:35:56 +02:00
parent 9b3677d509 99f3a55540
commit 2d8be0a6e1
32 changed files with 433 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/workers/post_process_media_worker.rb
View File

@@ -32,7 +32,7 @@ class PostProcessMediaWorker
media_attachment.file.reprocess!(:original)
media_attachment.processing = :complete
media_attachment.file_meta = previous_meta.merge(media_attachment.file_meta).with_indifferent_access.slice(:focus, :original, :small)
media_attachment.file_meta = previous_meta.merge(media_attachment.file_meta).with_indifferent_access.slice(*MediaAttachment::META_KEYS)
media_attachment.save
rescue ActiveRecord::RecordNotFound
true