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-09-24 15:09:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-24 15:09:37 +0300
commit6f15c2c2723dbe14e907379b75201e2ef70a48d3 (patch)
treef917af54164003d021a4af518ced7271978c5537 /app/assets/javascripts/issue_show
parent7a8d983c19c9fe14e7c0b8b6256b8cbacbff1959 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issue_show')
-rw-r--r--app/assets/javascripts/issue_show/components/incidents/highlight_bar.vue11
1 files changed, 3 insertions, 8 deletions
diff --git a/app/assets/javascripts/issue_show/components/incidents/highlight_bar.vue b/app/assets/javascripts/issue_show/components/incidents/highlight_bar.vue
index 780b62c7938..b2aa5265331 100644
--- a/app/assets/javascripts/issue_show/components/incidents/highlight_bar.vue
+++ b/app/assets/javascripts/issue_show/components/incidents/highlight_bar.vue
@@ -1,11 +1,10 @@
<script>
-import { GlLink, GlTooltipDirective, GlSprintf } from '@gitlab/ui';
+import { GlLink, GlTooltipDirective } from '@gitlab/ui';
import { formatDate } from '~/lib/utils/datetime_utility';
export default {
components: {
GlLink,
- GlSprintf,
},
directives: {
GlTooltip: GlTooltipDirective,
@@ -26,16 +25,12 @@ export default {
<template>
<div
- class="gl-border-solid gl-border-1 gl-border-gray-100 gl-p-5 gl-mb-3 gl-rounded-base gl-display-flex gl-justify-content-space-between"
+ class="gl-border-solid gl-border-1 gl-border-gray-100 gl-p-5 gl-mb-3 gl-rounded-base gl-display-flex gl-justify-content-space-between gl-xs-flex-direction-column"
>
<div class="gl-pr-3">
<span class="gl-font-weight-bold">{{ s__('HighlightBar|Original alert:') }}</span>
<gl-link v-gl-tooltip :title="alert.title" :href="alert.detailsUrl">
- <gl-sprintf :message="__('Alert #%{alertId}')">
- <template #alertId>
- <span>{{ alert.iid }}</span>
- </template>
- </gl-sprintf>
+ #{{ alert.iid }}
</gl-link>
</div>