Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-29 03:09:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-29 03:09:37 +0300
commit937f82e11fe1d3970ea3e1f281185e91d8f5102e (patch)
tree9c69e19144f2f9d7d5119496f468aea4f1538137 /app/assets/javascripts/incidents
parent583fadea8d738850cbd83dcde1118d3fc3462d61 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents')
-rw-r--r--app/assets/javascripts/incidents/components/incidents_list.vue12
-rw-r--r--app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql1
2 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue
index c1a73ba56f7..4cd86c4b8b9 100644
--- a/app/assets/javascripts/incidents/components/incidents_list.vue
+++ b/app/assets/javascripts/incidents/components/incidents_list.vue
@@ -9,6 +9,7 @@ import {
GlTooltipDirective,
GlButton,
GlSearchBoxByType,
+ GlIcon,
} from '@gitlab/ui';
import { debounce } from 'lodash';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
@@ -55,6 +56,7 @@ export default {
GlButton,
TimeAgoTooltip,
GlSearchBoxByType,
+ GlIcon,
},
directives: {
GlTooltip: GlTooltipDirective,
@@ -164,7 +166,15 @@ export default {
@row-clicked="navigateToIncidentDetails"
>
<template #cell(title)="{ item }">
- <div class="gl-max-w-full text-truncate" :title="item.title">{{ item.title }}</div>
+ <div class="gl-display-flex gl-justify-content-center">
+ <div class="gl-max-w-full text-truncate" :title="item.title">{{ item.title }}</div>
+ <gl-icon
+ v-if="item.state === 'closed'"
+ name="issue-close"
+ class="gl-fill-blue-500"
+ data-testid="incident-closed"
+ />
+ </div>
</template>
<template #cell(createdAt)="{ item }">
diff --git a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
index e025a764c34..eeba60139ca 100644
--- a/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
+++ b/app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
@@ -10,6 +10,7 @@ query getIncidents(
iid
title
createdAt
+ state
labels {
nodes {
title