Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 35 insertions, 0 deletions

diff --git a/lib/gitlab/github_import/importer/attachments/notes_importer.rb b/lib/gitlab/github_import/importer/attachments/notes_importer.rb
new file mode 100644
index 00000000000..aa38a7a3a3f
--- /dev/null
+++ b/lib/gitlab/github_import/importer/attachments/notes_importer.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GithubImport
+    module Importer
+      module Attachments
+        class NotesImporter < ::Gitlab::GithubImport::Importer::Attachments::BaseImporter
+          def sidekiq_worker_class
+            ::Gitlab::GithubImport::Attachments::ImportNoteWorker
+          end
+
+          def collection_method
+            :note_attachments
+          end
+
+          def object_type
+            :note_attachment
+          end
+
+          def id_for_already_imported_cache(note)
+            note.id
+          end
+
+          private
+
+          # TODO: exclude :system, :noteable_type from select after removing override Note#note method
+          # https://gitlab.com/gitlab-org/gitlab/-/issues/369923
+          def collection
+            project.notes.user.select(:id, :note, :system, :noteable_type)
+          end
+        end
+      end
+    end
+  end
+end