diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 18:09:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-23 18:09:28 +0300 |
commit | 14fb5a922285d71fea67de59164ee4bb81ee3486 (patch) | |
tree | d3f585c54feb676aec2f14cc85fe32d615fd7fc0 /app/assets/javascripts/incidents | |
parent | d9b0b3243e3cd71a08ff5d4035b7882cc7a5a35f (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.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index a974afbe539..68466a5cc91 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -1,5 +1,6 @@ <script> import { GlLoadingIcon, GlTable, GlAlert } from '@gitlab/ui'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { s__ } from '~/locale'; import getIncidents from '../graphql/queries/get_incidents.query.graphql'; import { I18N } from '../constants'; @@ -36,6 +37,7 @@ export default { GlLoadingIcon, GlTable, GlAlert, + TimeAgoTooltip, }, inject: ['projectPath'], apollo: { @@ -108,7 +110,7 @@ export default { </template> <template #cell(createdAt)="{ item }"> - {{ item.createdAt }} + <time-ago-tooltip :time="item.createdAt" /> </template> <template #cell(assignees)="{ item }"> |