Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb b/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb
index 45bbc25e637..8e4015acbbc 100644
--- a/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb
+++ b/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb
@@ -18,13 +18,16 @@ module Gitlab
             { project: project.id, collection: collection_method }
         end
 
+        # In single endpoint there is no issue info to which associated related
+        # To make it possible to identify issue in separated worker we need to patch
+        # Sawyer instances here with issue number
         def each_associated(parent_record, associated)
           compose_associated_id!(parent_record, associated)
           return if already_imported?(associated)
 
           Gitlab::GithubImport::ObjectCounter.increment(project, object_type, :fetched)
 
-          associated.issue_db_id = parent_record.id
+          associated.issue = { 'number' => parent_record.iid }
           yield(associated)
 
           mark_as_imported(associated)