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

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/gitlab/github_import/importer/events/changed_milestone.rb b/lib/gitlab/github_import/importer/events/changed_milestone.rb
index 3164c041dc3..39b92d88b58 100644
--- a/lib/gitlab/github_import/importer/events/changed_milestone.rb
+++ b/lib/gitlab/github_import/importer/events/changed_milestone.rb
@@ -17,14 +17,15 @@ module Gitlab
           private
 
           def create_event(issue_event)
-            ResourceMilestoneEvent.create!(
-              issue_id: issuable_db_id(issue_event),
+            attrs = {
               user_id: author_id(issue_event),
               created_at: issue_event.created_at,
               milestone_id: project.milestones.find_by_title(issue_event.milestone_title)&.id,
               action: action(issue_event.event),
               state: DEFAULT_STATE
-            )
+            }.merge(resource_event_belongs_to(issue_event))
+
+            ResourceMilestoneEvent.create!(attrs)
           end
 
           def action(event_type)