Merge branch '14256-upload-destroy-removes-file' into 'master'

Uploads should delete files when destroyed

Closes #14256

See merge request gitlab-org/gitlab-ce!16799

1 files changed, 6 insertions, 0 deletions

diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index 2310e67cb2e..bde1161dfa8 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -15,6 +15,8 @@ class FileUploader < GitlabUploader
 
   storage :file
 
+  after :remove, :prune_store_dir
+
   def self.root
     File.join(options.storage_path, 'uploads')
   end
@@ -140,6 +142,10 @@ class FileUploader < GitlabUploader
     end
   end
 
+  def prune_store_dir
+    storage.delete_dir!(store_dir) # only remove when empty
+  end
+
   def markdown_name
     (image_or_video? ? File.basename(filename, File.extname(filename)) : filename).gsub("]", "\\]")
   end