summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-05-30 11:43:37 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-05-30 11:43:37 +0000
commitd5686516bb3d1aaa75c5dffe09fcbc0ef3469521 (patch)
tree5180645ef97728ac372edc900bc31b984d6de613
parent043488f575733ae1eedcf142439a24e8b1222848 (diff)
parent2d19bf65512d9dcd43965b87eabec7f9c5a3e7e0 (diff)
downloadgitlab-ce-d5686516bb3d1aaa75c5dffe09fcbc0ef3469521.tar.gz
Merge branch 'referenced-labels' into 'master'
Add referenced-commands in no overflow list See merge request gitlab-org/gitlab-ce!28858
-rw-r--r--app/assets/stylesheets/pages/labels.scss3
-rw-r--r--changelogs/unreleased/referenced-labels.yml5
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 13288d8bad1..11e8a32389f 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -456,8 +456,9 @@
// Don't hide the overflow in system messages
.system-note-message,
-.issuable-detail,
+.issuable-details,
.md-preview-holder,
+.referenced-commands,
.note-body {
.scoped-label-wrapper {
.badge {
diff --git a/changelogs/unreleased/referenced-labels.yml b/changelogs/unreleased/referenced-labels.yml
new file mode 100644
index 00000000000..c39ef4c2478
--- /dev/null
+++ b/changelogs/unreleased/referenced-labels.yml
@@ -0,0 +1,5 @@
+---
+title: Add referenced-commands in no overflow list
+merge_request: 28858
+author:
+type: fixed