summaryrefslogtreecommitdiff
path: root/lib
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 /lib
parent056dd422ea9e03869c182a9200fcbe9166d01ad1 (diff)
downloadgitlab-ce-4f791ec8bd51d2bacada5ba48334c16076cf91b8.tar.gz
Add latest changes from gitlab-org/gitlab@14-10-stable-ee
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers.rb1
-rw-r--r--lib/gitlab/workhorse.rb7
2 files changed, 0 insertions, 8 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index e4a7f2213ae..ee0520df8ff 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -714,7 +714,6 @@ module API
def send_artifacts_entry(file, entry)
header(*Gitlab::Workhorse.send_artifacts_entry(file, entry))
- header(*Gitlab::Workhorse.detect_content_type)
body ''
end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index d74efd458f6..19d30daa577 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -226,13 +226,6 @@ module Gitlab
end
end
- def detect_content_type
- [
- Gitlab::Workhorse::DETECT_HEADER,
- 'true'
- ]
- end
-
protected
# This is the outermost encoding of a senddata: header. It is safe for