Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/gitlab/github_import/importer/events/closed.rb b/lib/gitlab/github_import/importer/events/closed.rb
index ca8730d0f27..58d9dbf826c 100644
--- a/lib/gitlab/github_import/importer/events/closed.rb
+++ b/lib/gitlab/github_import/importer/events/closed.rb
@@ -17,7 +17,7 @@ module Gitlab
               project_id: project.id,
               author_id: author_id(issue_event),
               action: 'closed',
-              target_type: Issue.name,
+              target_type: issuable_type(issue_event),
               target_id: issuable_db_id(issue_event),
               created_at: issue_event.created_at,
               updated_at: issue_event.created_at
@@ -25,15 +25,16 @@ module Gitlab
           end
 
           def create_state_event(issue_event)
-            ResourceStateEvent.create!(
+            attrs = {
               user_id: author_id(issue_event),
-              issue_id: issuable_db_id(issue_event),
               source_commit: issue_event.commit_id,
               state: 'closed',
               close_after_error_tracking_resolve: false,
               close_auto_resolve_prometheus_alert: false,
               created_at: issue_event.created_at
-            )
+            }.merge(resource_event_belongs_to(issue_event))
+
+            ResourceStateEvent.create!(attrs)
           end
         end
       end