diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 17:34:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 17:34:57 +0000 |
| commit | b2ce3643e27db4cc0ad30cc09d651c00ec799887 (patch) | |
| tree | f0e7882be8145da2f59fec4ac26e070afd147ab9 /app/controllers | |
| parent | e9143b15cc400b69ef274789225ac2fee5fdcf83 (diff) | |
| download | gitlab-ce-b2ce3643e27db4cc0ad30cc09d651c00ec799887.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'app/controllers')
| -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 |