summaryrefslogtreecommitdiff
path: root/app/helpers/workhorse_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-04 13:41:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-04 13:41:07 +0000
commit4f791ec8bd51d2bacada5ba48334c16076cf91b8 (patch)
tree89c61fbbfdc63b8d920787f78ff226967b87d7b8 /app/helpers/workhorse_helper.rb
parent056dd422ea9e03869c182a9200fcbe9166d01ad1 (diff)
downloadgitlab-ce-4f791ec8bd51d2bacada5ba48334c16076cf91b8.tar.gz
Add latest changes from gitlab-org/gitlab@14-10-stable-ee
Diffstat (limited to 'app/helpers/workhorse_helper.rb')
-rw-r--r--app/helpers/workhorse_helper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb
index f1ddc2e902e..70df696510a 100644
--- a/app/helpers/workhorse_helper.rb
+++ b/app/helpers/workhorse_helper.rb
@@ -38,8 +38,6 @@ module WorkhorseHelper
# 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