2 files changed, 23 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index fbd291f095a..f8620eec46d 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -107,6 +107,10 @@
   }
 
   .scoped-label-wrapper {
+    > a {
+      max-width: 100%;
+    }
+
     .color-label {
       padding-right: $gl-padding-24;
     }
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index e7fd7fab32b..d17d20bb683 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -408,12 +408,21 @@
 }
 
 .scoped-label-wrapper {
+  max-width: 100%;
+  vertical-align: top;
+
+  .badge {
+    text-overflow: ellipsis;
+    overflow-x: hidden;
+  }
+
   &.label-link .color-label a {
     color: inherit;
   }
 
   .color-label {
     padding-right: $gl-padding-24;
+    max-width: 100%;
   }
 
   .scoped-label {
@@ -438,3 +447,13 @@
     }
   }
 }
+
+// Don't hide the overflow in system messages
+.system-note-message,
+.issuable-detail {
+  .scoped-label-wrapper {
+    .badge {
+      overflow: initial;
+    }
+  }
+}