diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
| commit | 2d8be0a6e1fbe9da892937b05b373ab907d89b77 (patch) | |
| tree | 73eb669adcc8b13c63dded5a887cb5ecc817894d /app/workers | |
| parent | 9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff) | |
| parent | 99f3a5554074d9a12619797c474b3de4c6085f02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/post_process_media_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb index a904f35b1..24201101c 100644 --- a/app/workers/post_process_media_worker.rb +++ b/app/workers/post_process_media_worker.rb @@ -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 |