diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:08:19 +0300 |
| commit | 02ab65d49fc94be7c91e511899762236c122977d (patch) | |
| tree | 4d4bf4ec54a95a0d73e039fa1410ea841156ffb2 /lib/gitlab/email/attachment_uploader.rb | |
| parent | 4411353300cf8219d2b899785bc5103c549ba8cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/email/attachment_uploader.rb')
| -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 3323ce60158..0a14a909e31 100644 --- a/lib/gitlab/email/attachment_uploader.rb +++ b/lib/gitlab/email/attachment_uploader.rb @@ -9,7 +9,7 @@ module Gitlab @message = message end - def execute(project) + def execute(upload_parent:, uploader_class:) attachments = [] message.attachments.each do |attachment| @@ -23,7 +23,7 @@ module Gitlab content_type: attachment.content_type } - uploader = UploadService.new(project, file).execute + uploader = UploadService.new(upload_parent, file, uploader_class).execute attachments << uploader.to_h if uploader ensure tmp.close! |