Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/notes/components/note_body.vue

@@ -101,6 +101,7 @@ export default {
   <div ref="note-body" :class="{ 'js-task-list-container': canEdit }" class="note-body">
     <suggestions
       v-if="hasSuggestion && !isEditing"
+      class="note-text md"
       :suggestions="note.suggestions"
       :note-html="note.note_html"
       :line-type="lineType"

app/assets/javascripts/vue_shared/components/markdown/suggestions.vue

@@ -130,6 +130,6 @@ export default {
 <template>
   <div>
     <div class="flash-container js-suggestions-flash"></div>
-    <div v-show="isRendered" ref="container" class="note-text md" v-html="noteHtml"></div>
+    <div v-show="isRendered" ref="container" v-html="noteHtml"></div>
   </div>
 </template>

app/assets/stylesheets/framework/mixins.scss

@@ -36,10 +36,6 @@
     width: fit-content;
   }
 
-  tbody {
-    background-color: $white-light;
-  }
-
   tr {
     th {
       border-bottom: solid 2px $gl-gray-100;

changelogs/unreleased/syntax-highlighting-again.yml

+---
+title: Fix suggested changes syntax highlighting
+merge_request: 25116
+author:
+type: fixed