Skip to content
代码片段 群组 项目
未验证 提交 3e109880 编辑于 作者: Thomas Randolph's avatar Thomas Randolph 提交者: GitLab
浏览文件

Use `pre-wrap` to both preserve whitespace and wrap long lines

... in MR views that display commit messages.

Changelog: fixed
上级 e5ee6494
No related branches found
No related tags found
无相关合并请求
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
v-if="commit.description_html" v-if="commit.description_html"
v-safe-html:[$options.safeHtmlConfig]="commitDescription" v-safe-html:[$options.safeHtmlConfig]="commitDescription"
:class="{ 'js-toggle-content': collapsible, 'd-block': !collapsible }" :class="{ 'js-toggle-content': collapsible, 'd-block': !collapsible }"
class="commit-row-description gl-mb-3 gl-text-body gl-white-space-pre-line" class="commit-row-description gl-mb-3 gl-text-body gl-white-space-pre-wrap"
></pre> ></pre>
</div> </div>
</li> </li>
......
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
v-if="commitDescription" v-if="commitDescription"
v-safe-html:[$options.safeHtmlConfig]="commitDescription" v-safe-html:[$options.safeHtmlConfig]="commitDescription"
:class="{ 'gl-display-block!': showDescription }" :class="{ 'gl-display-block!': showDescription }"
class="commit-row-description gl-mb-3 gl-white-space-pre-line" class="commit-row-description gl-mb-3 gl-white-space-pre-wrap"
></pre> ></pre>
</div> </div>
<div class="gl-flex-grow-1"></div> <div class="gl-flex-grow-1"></div>
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
= render_if_exists 'projects/commits/project_namespace', show_project_name: show_project_name, project: project = render_if_exists 'projects/commits/project_namespace', show_project_name: show_project_name, project: project
- if commit.description? - if commit.description?
%pre{ class: ["commit-row-description gl-mb-3 gl-white-space-pre-line", (collapsible ? "js-toggle-content" : "d-block")] } %pre{ class: ["commit-row-description gl-mb-3 gl-white-space-pre-wrap", (collapsible ? "js-toggle-content" : "d-block")] }
= preserve(markdown_field(commit, :description)) = preserve(markdown_field(commit, :description))
.commit-actions.flex-row .commit-actions.flex-row
......
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
</template> </template>
<gl-skeleton-loader v-if="loadingCommitMessage" :width="250" :lines="4" /> <gl-skeleton-loader v-if="loadingCommitMessage" :width="250" :lines="4" />
<template v-else> <template v-else>
<pre class="commit-row-description gl-mb-3 gl-white-space-pre-line js-toggle-content"> <pre class="commit-row-description gl-mb-3 gl-white-space-pre-wrap js-toggle-content">
{{ commitMessage }} {{ commitMessage }}
</pre> </pre>
<user-feedback :event-name="$options.feedback.eventName" /> <user-feedback :event-name="$options.feedback.eventName" />
......
...@@ -77,7 +77,7 @@ describe('Repository last commit component', () => { ...@@ -77,7 +77,7 @@ describe('Repository last commit component', () => {
it('strips the first newline of the description', () => { it('strips the first newline of the description', () => {
expect(findCommitRowDescription().html()).toBe( expect(findCommitRowDescription().html()).toBe(
'<pre class="commit-row-description gl-mb-3 gl-white-space-pre-line">Update ADOPTERS.md</pre>', '<pre class="commit-row-description gl-mb-3 gl-white-space-pre-wrap">Update ADOPTERS.md</pre>',
); );
}); });
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册