diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 18:12:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-18 18:12:17 +0300 |
| commit | c48bbe6650648fa034696de25983418981e695eb (patch) | |
| tree | 0dcf30de46ba62585746d9e5f8fa6ceb52df7d28 /lib/gitlab/email | |
| parent | c7b2529418eb0fb802637709eafe8016a4d106b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/email')
| -rw-r--r-- | lib/gitlab/email/attachment_uploader.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/email/attachment_uploader.rb b/lib/gitlab/email/attachment_uploader.rb index b67ca8d8a7d..931276588f0 100644 --- a/lib/gitlab/email/attachment_uploader.rb +++ b/lib/gitlab/email/attachment_uploader.rb @@ -20,8 +20,8 @@ module Gitlab sanitize_exif_if_needed(content, tmp.path) file = { - tempfile: tmp, - filename: attachment.filename, + tempfile: tmp, + filename: attachment.filename, content_type: attachment.content_type } |