From ee664acb356f8123f4f6b00b73c1e1cf0866c7fb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Oct 2022 09:40:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-5-stable-ee

---
 app/assets/javascripts/repository/components/last_commit.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/assets/javascripts/repository/components/last_commit.vue')

diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue
index 22fe3fe440e..05d64077866 100644
--- a/app/assets/javascripts/repository/components/last_commit.vue
+++ b/app/assets/javascripts/repository/components/last_commit.vue
@@ -122,14 +122,12 @@ export default {
         :link-href="commit.author.webPath"
         :img-src="commit.author.avatarUrl"
         :img-size="32"
-        :img-css-classes="'gl-mr-0!' /* NOTE: this is needed only while we migrate user-avatar-image to GlAvatar (7731 epics) */"
         class="gl-my-2 gl-mr-4"
       />
       <user-avatar-image
         v-else
         class="gl-my-2 gl-mr-4"
         :img-src="commit.authorGravatar || $options.defaultAvatarUrl"
-        :css-classes="'gl-mr-0!' /* NOTE: this is needed only while we migrate user-avatar-image to GlAvatar (7731 epics) */"
         :size="32"
       />
       <div
@@ -171,7 +169,7 @@ export default {
             v-if="commitDescription"
             v-safe-html:[$options.safeHtmlConfig]="commitDescription"
             :class="{ 'd-block': showDescription }"
-            class="commit-row-description gl-mb-3"
+            class="commit-row-description gl-mb-3 gl-white-space-pre-line"
           ></pre>
         </div>
         <div class="gl-flex-grow-1"></div>
-- 
cgit v1.2.3