Merge branch 'issue_36060' into 'master'

Fix reply emails with attachments for epics

See merge request gitlab-org/gitlab!22547

ee/changelogs/unreleased/issue_36060.yml

+---
+title: Fix reply emails with attachments for epics
+merge_request: 22547
+author:
+type: fixed

ee/lib/ee/gitlab/email/handler/reply_processing.rb

@@ -24,6 +24,16 @@ module EE
           def process_message(**kwargs)
             strip_quick_actions(super(kwargs))
           end
+
+          override :upload_params
+          def upload_params
+            return super unless try(:noteable)&.is_a?(Epic)
+
+            {
+              upload_parent: noteable.group,
+              uploader_class: NamespaceFileUploader
+            }
+          end
         end
       end
     end

ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb

@@ -79,10 +79,21 @@ describe Gitlab::Email::Handler::CreateNoteHandler do
     end
 
     it "adds all attachments" do
+      expect_next_instance_of(Gitlab::Email::AttachmentUploader) do |uploader|
+        expect(uploader).to receive(:execute).with(upload_parent: group, uploader_class: NamespaceFileUploader).and_return(
+          [
+            {
+              url: "uploads/image.png",
+              alt: "image",
+              markdown: markdown
+            }
+          ]
+        )
+      end
+
       receiver.execute
 
       note = noteable.notes.last
-
       expect(note.note).to include(markdown)
     end
 

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!

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?

spec/lib/gitlab/email/attachment_uploader_spec.rb

@@ -9,7 +9,7 @@ describe Gitlab::Email::AttachmentUploader do
     let(:message) { Mail::Message.new(message_raw) }
 
     it "uploads all attachments and returns their links" do
-      links = described_class.new(message).execute(project)
+      links = described_class.new(message).execute(upload_parent: project, uploader_class: FileUploader)
       link = links.first
 
       expect(link).not_to be_nil

spec/lib/gitlab/email/handler/create_note_handler_spec.rb

@@ -181,10 +181,21 @@ describe Gitlab::Email::Handler::CreateNoteHandler do
     it_behaves_like 'a reply to existing comment'
 
     it "adds all attachments" do
+      expect_next_instance_of(Gitlab::Email::AttachmentUploader) do |uploader|
+        expect(uploader).to receive(:execute).with(upload_parent: project, uploader_class: FileUploader).and_return(
+          [
+            {
+              url: "uploads/image.png",
+              alt: "image",
+              markdown: markdown
+            }
+          ]
+        )
+      end
+
       receiver.execute
 
       note = noteable.notes.last
-
       expect(note.note).to include(markdown)
     end