From c741f537762fa14d01f8817f9d80bcbba2c01ddd Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 22 Feb 2024 00:05:13 -0700
Subject: [PATCH 1/3] Use `pre-wrap` to both preserve whitespace and wrap long
 lines

... in MR views that display commit messages.

Changelog: fixed
---
 app/assets/javascripts/diffs/components/commit_item.vue | 2 +-
 app/views/projects/commits/_commit.html.haml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue
index a6e4a57a5189c4..e3bb8ddd3487a2 100644
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@@ -173,7 +173,7 @@ export default {
         v-if="commit.description_html"
         v-safe-html:[$options.safeHtmlConfig]="commitDescription"
         :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>
     </div>
   </li>
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index db70d596679f7d..57e260147e3a61 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -53,7 +53,7 @@
       = render_if_exists 'projects/commits/project_namespace', show_project_name: show_project_name, project: project
 
       - 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))
 
     .commit-actions.flex-row
-- 
GitLab


From 485fb18940399d288d96a345c7b82535be954277 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 22 Feb 2024 15:38:02 -0700
Subject: [PATCH 2/3] Use `pre-wrap` to preserve whitespace and wrap lines

...in Source Code and AI-generated commit views.
---
 app/assets/javascripts/repository/components/commit_info.vue    | 2 +-
 .../vue_merge_request_widget/components/ai_commit_message.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/repository/components/commit_info.vue b/app/assets/javascripts/repository/components/commit_info.vue
index b97a3934efdb4e..4e6fb4fe26ac1c 100644
--- a/app/assets/javascripts/repository/components/commit_info.vue
+++ b/app/assets/javascripts/repository/components/commit_info.vue
@@ -133,7 +133,7 @@ export default {
           v-if="commitDescription"
           v-safe-html:[$options.safeHtmlConfig]="commitDescription"
           :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>
       </div>
       <div class="gl-flex-grow-1"></div>
diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
index 57e5a85b95e2c9..7f2c90bb59eb3d 100644
--- a/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
+++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue
@@ -140,7 +140,7 @@ export default {
       </template>
       <gl-skeleton-loader v-if="loadingCommitMessage" :width="250" :lines="4" />
       <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 }}
         </pre>
         <user-feedback :event-name="$options.feedback.eventName" />
-- 
GitLab


From 6dedbcd8711df2aed1a471e273270e08dbe9ac0c Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 23 Feb 2024 12:19:51 -0700
Subject: [PATCH 3/3] Update test that is looking for element classes

---
 spec/frontend/repository/components/commit_info_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/frontend/repository/components/commit_info_spec.js b/spec/frontend/repository/components/commit_info_spec.js
index f868bc0623e498..78da409b0db8e3 100644
--- a/spec/frontend/repository/components/commit_info_spec.js
+++ b/spec/frontend/repository/components/commit_info_spec.js
@@ -77,7 +77,7 @@ describe('Repository last commit component', () => {
 
     it('strips the first newline of the description', () => {
       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>',
       );
     });
 
-- 
GitLab