From 807d57c18fdde0d9ba991a2b3b078a74a7472f30 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 25 Mar 2021 06:09:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/jobs_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects/jobs_controller.rb') diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 8a2ea51ba9d..f19a86209fc 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -226,10 +226,10 @@ class Projects::JobsController < Projects::ApplicationController end def raw_trace_content_disposition(raw_data) - mime_type = MimeMagic.by_magic(raw_data) + mime_type = Gitlab::Utils::MimeType.from_string(raw_data) # if mime_type is nil can also represent 'text/plain' - return 'inline' if mime_type.nil? || mime_type.type == 'text/plain' + return 'inline' if mime_type.nil? || mime_type == 'text/plain' 'attachment' end -- cgit v1.2.3