summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-10-29 17:35:00 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-10-29 17:35:00 +0000
commit48e61c6c721a52914658142139218dbcc19394be (patch)
tree87bb7ec829e48e01f38130b8ac8116a79badd9e5
parent05af98bfefba87f60eda58642a6422af10c129ae (diff)
parent7921e7d2555ca2a49cc15648e2054a3c13f166a2 (diff)
downloadgitlab-ce-48e61c6c721a52914658142139218dbcc19394be.tar.gz
Merge branch 'gt-truncate-milestone-title-on-collapsed-sidebar' into 'master'
Truncate milestone title on collapsed sidebar See merge request gitlab-org/gitlab-ce!22624
-rw-r--r--app/views/shared/issuable/_sidebar.html.haml2
-rw-r--r--changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 10ffe8dd37f..5295e656ab0 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -24,7 +24,7 @@
.block.milestone
.sidebar-collapsed-icon.has-tooltip{ title: milestone_tooltip_title(issuable.milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
= icon('clock-o', 'aria-hidden': 'true')
- %span.milestone-title
+ %span.milestone-title.collapse-truncated-title
- if issuable.milestone
= issuable.milestone.title
- else
diff --git a/changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml b/changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml
new file mode 100644
index 00000000000..ca3b99e73ab
--- /dev/null
+++ b/changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml
@@ -0,0 +1,5 @@
+---
+title: Truncate milestone title on collapsed sidebar
+merge_request: 22624
+author: George Tsiolis
+type: changed