diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 09:09:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 09:09:02 +0300 |
| commit | 807d57c18fdde0d9ba991a2b3b078a74a7472f30 (patch) | |
| tree | d327848aee84f9af2fef556a0652b2f6e5da7aea /app/controllers/projects/jobs_controller.rb | |
| parent | 3bd9ad5574f2ee81888dc13bc29e1d66dafaedba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |