From 3cccd102ba543e02725d247893729e5c73b38295 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Apr 2022 10:00:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-10-stable-ee --- app/helpers/workhorse_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/helpers/workhorse_helper.rb') diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb index 2460c956bb6..f1ddc2e902e 100644 --- a/app/helpers/workhorse_helper.rb +++ b/app/helpers/workhorse_helper.rb @@ -35,9 +35,11 @@ module WorkhorseHelper head :ok end - # Send an entry from artifacts through Workhorse + # Send an entry from artifacts through Workhorse and set safe content type def send_artifacts_entry(file, entry) headers.store(*Gitlab::Workhorse.send_artifacts_entry(file, entry)) + headers.store(*Gitlab::Workhorse.detect_content_type) + head :ok end -- cgit v1.2.3