Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/gitlab/email/handler/reply_processing.rb b/lib/gitlab/email/handler/reply_processing.rb
index 6b7686cd405..312a9fdfbae 100644
--- a/lib/gitlab/email/handler/reply_processing.rb
+++ b/lib/gitlab/email/handler/reply_processing.rb
@@ -41,13 +41,20 @@ module Gitlab
         end
 
         def add_attachments(reply)
-          attachments = Email::AttachmentUploader.new(mail).execute(project)
+          attachments = Email::AttachmentUploader.new(mail).execute(upload_params)
 
           reply + attachments.map do |link|
             "\n\n#{link[:markdown]}"
           end.join
         end
 
+        def upload_params
+          {
+            upload_parent: project,
+            uploader_class: FileUploader
+          }
+        end
+
         def validate_permission!(permission)
           raise UserNotFoundError unless author
           raise UserBlockedError if author.blocked?