diff --git a/src/assets/styles/gitlab_ui.scss b/src/assets/styles/gitlab_ui.scss index 94b93cb1c50cfc823ac40d11cb8ab9203f7ef92f..bbe662036a60f6584be5ab784752c7f7f1c6e97a 100644 --- a/src/assets/styles/gitlab_ui.scss +++ b/src/assets/styles/gitlab_ui.scss @@ -10,5 +10,4 @@ @import '@gitlab/ui/src/components/base/loading_icon/loading_icon'; @import '@gitlab/ui/src/components/base/alert/alert'; @import '@gitlab/ui/src/components/base/new_button/new_button'; -@import '@gitlab/ui/src/components/base/tooltip/tooltip'; @import '@gitlab/ui/src/components/base/navbar/navbar'; diff --git a/src/assets/styles/global.scss b/src/assets/styles/global.scss index 01614238246ce9590ec68df3de18afe7a762fddc..7e7cf7c0158b6e448431f514825cd9dc68da24e1 100644 --- a/src/assets/styles/global.scss +++ b/src/assets/styles/global.scss @@ -1,6 +1,7 @@ @import 'gitlab_ui'; @import 'bootstrap'; @import 'bootstrap-vue'; +@import '@gitlab/ui/src/components/base/tooltip/tooltip'; @import 'common'; /* diff --git a/src/components/list_incident.vue b/src/components/list_incident.vue index 61e40ade0bd01ca0498212fb42e2732103d94121..63b2eb73eb92767bbf609ec8d791f7d61d2680f5 100644 --- a/src/components/list_incident.vue +++ b/src/components/list_incident.vue @@ -34,7 +34,7 @@ export default { >
{{ formatDate(incident.created_at) }} - +
{{ formatDateTime(incident.created_at) }}
{{ formatDateTimeZone(incident.created_at) }}
diff --git a/tests/unit/components/__snapshots__/list_incident_spec.js.snap b/tests/unit/components/__snapshots__/list_incident_spec.js.snap index be42adac609b8013b6bd95996f02f68c14e5219c..07c890c0183e2aac3dc8dea26a37974bfba572f6 100644 --- a/tests/unit/components/__snapshots__/list_incident_spec.js.snap +++ b/tests/unit/components/__snapshots__/list_incident_spec.js.snap @@ -12,6 +12,7 @@ exports[`List Incident renders the component 1`] = `