diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 00:18:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 00:18:49 +0200 |
| commit | 814d3f343f8caae3366410900eec0b90b9bbbb7b (patch) | |
| tree | 5d0b779a144afd2bff33503804cd5dcc58012ff6 /app/workers/post_process_media_worker.rb | |
| parent | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (diff) | |
| parent | 3d7ce178dd7be9ef02d34bf6734365d0aefa3120 (diff) | |
Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers/post_process_media_worker.rb')
| -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 73f9ae2bf..a904f35b1 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 + media_attachment.file_meta = previous_meta.merge(media_attachment.file_meta).with_indifferent_access.slice(:focus, :original, :small) media_attachment.save rescue ActiveRecord::RecordNotFound true |