Merge branch '5307-fix-personal-snippets-background-upload' into 'master'

Resolve "Snippets uploads fails when background upload is enabled"

Closes #5307

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

app/controllers/projects/lfs_storage_controller.rb

@@ -72,12 +72,6 @@ class Projects::LfsStorageController < Projects::GitHttpClientController
     end
   end
 
-  def move_tmp_file_to_storage(object, path)
-    object.file = File.open(path)
-    object.file.store!
-    object.save
-  end
-
   def link_to_project!(object)
     if object && !object.projects.exists?(storage_project.id)
       object.projects << storage_project

app/uploaders/file_mover.rb

@@ -10,7 +10,11 @@ class FileMover
 
   def execute
     move
-    uploader.record_upload if update_markdown
+
+    if update_markdown
+      uploader.record_upload
+      uploader.schedule_background_upload
+    end
   end
 
   private

app/uploaders/object_storage.rb

@@ -55,6 +55,7 @@ module ObjectStorage
 
       def schedule_background_upload(*args)
         return unless schedule_background_upload?
+        return unless upload
 
         ObjectStorage::BackgroundMoveWorker.perform_async(self.class.name,
                                                 upload.class.to_s,

ee/changelogs/unreleased/5307-fix-personal-snippets-background-upload.yml

+---
+title: Fixed personal snippets uploads when background upload is enabled.
+merge_request: 5049
+author:
+type: fixed

spec/uploaders/file_mover_spec.rb

@@ -36,6 +36,12 @@ describe FileMover do
       it 'creates a new update record' do
         expect { subject }.to change { Upload.count }.by(1)
       end
+
+      it 'schedules a background migration' do
+        expect_any_instance_of(PersonalFileUploader).to receive(:schedule_background_upload).once
+
+        subject
+      end
     end
 
     context 'when update_markdown fails' do