Merge branch 'revert-4976259a' into 'master'

Revert "Merge branch 'morefice/fix-artifacts-content-type' into 'master'"

See merge request gitlab-org/gitlab!83917

(cherry picked from commit ac64173e)

8a6a8535 Revert "Merge branch 'morefice/fix-artifacts-content-type' into 'master'"

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
 

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

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

spec/controllers/projects/artifacts_controller_spec.rb

@@ -361,7 +361,6 @@ RSpec.describe Projects::ArtifactsController do
           subject
 
           expect(response).to have_gitlab_http_status(:ok)
-          expect(response.headers['Gitlab-Workhorse-Detect-Content-Type']).to eq('true')
           expect(send_data).to start_with('artifacts-entry:')
 
           expect(params.keys).to eq(%w(Archive Entry))

spec/lib/gitlab/workhorse_spec.rb

@@ -448,14 +448,6 @@ RSpec.describe Gitlab::Workhorse do
     end
   end
 
-  describe '.detect_content_type' do
-    subject { described_class.detect_content_type }
-
-    it 'returns array setting detect content type in workhorse' do
-      expect(subject).to eq(%w[Gitlab-Workhorse-Detect-Content-Type true])
-    end
-  end
-
   describe '.send_git_blob' do
     include FakeBlobHelpers
 

spec/requests/api/ci/job_artifacts_spec.rb

@@ -558,8 +558,7 @@ RSpec.describe API::Ci::JobArtifacts do
             expect(response).to have_gitlab_http_status(:ok)
             expect(response.headers.to_h)
               .to include('Content-Type' => 'application/json',
-                          'Gitlab-Workhorse-Send-Data' => /artifacts-entry/,
-                          'Gitlab-Workhorse-Detect-Content-Type' => 'true')
+                          'Gitlab-Workhorse-Send-Data' => /artifacts-entry/)
           end
         end
 
@@ -629,8 +628,7 @@ RSpec.describe API::Ci::JobArtifacts do
           expect(response).to have_gitlab_http_status(:ok)
           expect(response.headers.to_h)
             .to include('Content-Type' => 'application/json',
-                        'Gitlab-Workhorse-Send-Data' => /artifacts-entry/,
-                        'Gitlab-Workhorse-Detect-Content-Type' => 'true')
+                        'Gitlab-Workhorse-Send-Data' => /artifacts-entry/)
           expect(response.parsed_body).to be_empty
         end
       end
@@ -648,8 +646,7 @@ RSpec.describe API::Ci::JobArtifacts do
           expect(response).to have_gitlab_http_status(:ok)
           expect(response.headers.to_h)
             .to include('Content-Type' => 'application/json',
-                        'Gitlab-Workhorse-Send-Data' => /artifacts-entry/,
-                        'Gitlab-Workhorse-Detect-Content-Type' => 'true')
+                        'Gitlab-Workhorse-Send-Data' => /artifacts-entry/)
         end
       end