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

2020-05-13 22:11:49 +02:00
parent 559214c33f 92f85bea52
commit 3baacf6993
28 changed files with 695 additions and 813 deletions
--- a/app/workers/redownload_media_worker.rb
+++ b/app/workers/redownload_media_worker.rb
@@ -11,7 +11,7 @@ class RedownloadMediaWorker

    return if media_attachment.remote_url.blank?

-    media_attachment.reset_file!
+    media_attachment.file_remote_url = media_attachment.remote_url
    media_attachment.save
  rescue ActiveRecord::RecordNotFound
    true