Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 5 insertions, 0 deletions

diff --git a/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue b/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue
index 321b7ccc14a..c6b93201c97 100644
--- a/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/timeline_events_list.vue
@@ -50,6 +50,9 @@ export default {
     },
   },
   methods: {
+    getFirstTag(eventTag) {
+      return eventTag.nodes?.[0]?.name;
+    },
     handleEditSelection(event) {
       this.eventToEdit = event.id;
       this.$emit('hide-new-incident-timeline-event-form');
@@ -153,6 +156,7 @@ export default {
             :edit-timeline-event-active="editTimelineEventActive"
             @handle-save-edit="handleSaveEdit"
             @hide-edit="hideEdit()"
+            @delete="handleDelete(event)"
           />
           <incident-timeline-event-item
             v-else
@@ -160,6 +164,7 @@ export default {
             :action="event.action"
             :occurred-at="event.occurredAt"
             :note-html="event.noteHtml"
+            :event-tag="getFirstTag(event.timelineEventTags)"
             @delete="handleDelete(event)"
             @edit="handleEditSelection(event)"
           />