Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/app/assets/javascripts/sidebar/components/severity/severity.vue b/app/assets/javascripts/sidebar/components/severity/severity.vue
index 7e7d62256c9..0db856543d0 100644
--- a/app/assets/javascripts/sidebar/components/severity/severity.vue
+++ b/app/assets/javascripts/sidebar/components/severity/severity.vue
@@ -1,9 +1,11 @@
 <script>
 import { GlIcon } from '@gitlab/ui';
+import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
 
 export default {
   components: {
     GlIcon,
+    TooltipOnTruncate,
   },
   props: {
     severity: {
@@ -30,13 +32,15 @@ export default {
 
 <template>
   <div
-    class="incident-severity gl-display-inline-flex gl-align-items-center gl-justify-content-between"
+    class="incident-severity gl-display-inline-flex gl-align-items-center gl-justify-content-between gl-max-w-full"
   >
     <gl-icon
       :size="iconSize"
       :name="`severity-${severity.icon}`"
       :class="[`icon-${severity.icon}`, { 'gl-mr-3': !iconOnly }]"
     />
-    <span v-if="!iconOnly">{{ severity.label }}</span>
+    <tooltip-on-truncate v-if="!iconOnly" :title="severity.label" class="gl-text-truncate">{{
+      severity.label
+    }}</tooltip-on-truncate>
   </div>
 </template>