diff --git a/.ruby-version b/.ruby-version index 57cf282ebbc..338a5b5d8fe 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.6.6 diff --git a/app/assets/javascripts/alert_management/components/alert_management_list.vue b/app/assets/javascripts/alert_management/components/alert_management_list.vue index 81399e1b70c..0b4e2d8ca02 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_list.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_list.vue @@ -10,7 +10,7 @@ import { GlDropdownItem, GlTabs, GlTab, - GlDeprecatedBadge as GlBadge, + GlBadge, } from '@gitlab/ui'; import createFlash from '~/flash'; import { s__ } from '~/locale'; @@ -77,6 +77,11 @@ export default { tdClass: `${tdClass} text-md-right`, sortable: true, }, + { + key: 'assignees', + label: s__('AlertManagement|Assignees'), + tdClass, + }, { key: 'status', thClass: 'w-15p', @@ -237,6 +242,10 @@ export default { const { category, action, label } = trackAlertStatusUpdateOptions; Tracking.event(category, action, { label, property: status }); }, + getAssignees(assignees) { + // TODO: Update to show list of assignee(s) after https://gitlab.com/gitlab-org/gitlab/-/issues/218405 + return assignees?.length > 0 ? assignees[0]?.username : s__('AlertManagement|Unassigned'); + }, }, }; @@ -308,6 +317,12 @@ export default {
{{ item.title }}
+ +