summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-06-12 19:12:34 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-06-12 19:12:34 +0000
commitb98633ade38bb75d750608f422c9fbc4b4080909 (patch)
tree84b809147bfac532ca75b770cd2e04290c59e868
parent50cddd36e505d49ebdb2b20c5c37ede56abad1df (diff)
parent03f35f0cc07ff89da03f56ba6e8c0df07ac83e10 (diff)
downloadgitlab-ce-b98633ade38bb75d750608f422c9fbc4b4080909.tar.gz
Merge branch '62134-fix-non-wraping-project-description' into 'master'
Adding break-word css to home-panel-description class to correctly word wrap long words Closes #62134 See merge request gitlab-org/gitlab-ce!28695
-rw-r--r--app/views/projects/_home_panel.html.haml2
-rw-r--r--changelogs/unreleased/62134-fix-non-wraping-project-description.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 9f5241344a7..824fe3c791d 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -64,7 +64,7 @@
.home-panel-home-desc.mt-1
- if @project.description.present?
- .home-panel-description
+ .home-panel-description.text-break
.home-panel-description-markdown.read-more-container
= markdown_field(@project, :description)
%button.btn.btn-blank.btn-link.js-read-more-trigger.d-lg-none{ type: "button" }
diff --git a/changelogs/unreleased/62134-fix-non-wraping-project-description.yml b/changelogs/unreleased/62134-fix-non-wraping-project-description.yml
new file mode 100644
index 00000000000..8c734c526fe
--- /dev/null
+++ b/changelogs/unreleased/62134-fix-non-wraping-project-description.yml
@@ -0,0 +1,5 @@
+---
+title: Correctly word-wrapping project descriptions with very long words
+merge_request: 28695
+author: Erik van der Gaag
+type: fixed