Merge branch 'fj-55781-fix-api-blob-content-disposition' into 'master'

Fixed content-disposition in blob and files API endpoint

Closes #55781

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

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index c3eca713712..6c1a730935a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -496,7 +496,7 @@ module API
     def send_git_blob(repository, blob)
       env['api.format'] = :txt
       content_type 'text/plain'
-      header['Content-Disposition'] = "attachment; filename=#{blob.name.inspect}"
+      header['Content-Disposition'] = content_disposition('attachment', blob.name)
       header(*Gitlab::Workhorse.send_git_blob(repository, blob))
     end
 
@@ -529,5 +529,11 @@ module API
 
       params[:archived]
     end
+
+    def content_disposition(disposition, filename)
+      disposition += %(; filename=#{filename.inspect}) if filename.present?
+
+      disposition
+    end
   end
 end