Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 2 deletions

diff --git a/app/workers/object_storage/migrate_uploads_worker.rb b/app/workers/object_storage/migrate_uploads_worker.rb
index 666bacb0188..7323ab50370 100644
--- a/app/workers/object_storage/migrate_uploads_worker.rb
+++ b/app/workers/object_storage/migrate_uploads_worker.rb
@@ -4,6 +4,8 @@
 module ObjectStorage
   class MigrateUploadsWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include ObjectStorageQueue
 
     feature_category_not_owned!
@@ -48,7 +50,7 @@ module ObjectStorage
         Gitlab::AppLogger.info header(success, failures)
         Gitlab::AppLogger.warn failures(failures)
 
-        raise MigrationFailures.new(failures.map(&:error)) if failures.any?
+        raise MigrationFailures, failures.map(&:error) if failures.any?
       end
 
       def header(success, failures)
@@ -132,7 +134,7 @@ module ObjectStorage
     def process_uploader(uploader)
       MigrationResult.new(uploader.upload).tap do |result|
         uploader.migrate!(@to_store)
-      rescue => e
+      rescue StandardError => e
         result.error = e
       end
     end