Merge branch '7026-pseudonymizer-worker-shouldnt-abort' into 'master'

Resolve "Pseudonymizer::Uploader should not call abort"

Closes #7026

See merge request gitlab-org/gitlab-ee!6707

ee/lib/pseudonymizer/uploader.rb

@@ -36,8 +36,6 @@ module Pseudonymizer
       file_list.each do |file|
         upload_file(file, remote_directory)
       end
-    rescue ObjectStorageUnavailableError
-      abort "Cannot upload files, make sure the `pseudonimizer.upload.connection` is set properly"
     end
 
     def cleanup

ee/lib/tasks/gitlab/db.rake

@@ -13,7 +13,9 @@ namespace :gitlab do
       dumper = Pseudonymizer::Dumper.new(options)
       uploader = Pseudonymizer::Uploader.new(options)
 
-      abort "There is an error in the pseudonymizer object store configuration." unless uploader.available?
+      unless uploader.available?
+        abort "There is an error in the pseudonymizer object store configuration."
+      end
 
       begin
         dumper.tables_to_csv