Automatic merge of gitlab-org/gitlab-ce master

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

@@ -50,7 +50,7 @@ export default {
       :help-page-path="helpPagePath"
       @apply="applySuggestion"
     />
-    <table class="mb-3 md-suggestion-diff">
+    <table class="mb-3 md-suggestion-diff js-syntax-highlight code">
       <tbody>
         <!-- Old Line -->
         <tr class="line_holder old">

changelogs/unreleased/55945-suggested-change-highlight.yml

+---
+title: Add syntax highlighting to suggestion diff
+merge_request: 24156
+author:
+type: fixed

spec/fixtures/security-reports/feature-branch/gl-container-scanning-report.json

 {
-    "image": "registry.gitlab.com/bikebilly/auto-devops-10-6/feature-branch:e7315ba964febb11bac8f5cd6ec433db8a3a1583",
-    "unapproved": [
-        "CVE-2017-15650"
-    ],
-    "vulnerabilities": [
-        {
-            "featurename": "musl",
-            "featureversion": "1.1.14-r15",
-            "vulnerability": "CVE-2017-15650",
-            "namespace": "alpine:v3.4",
-            "description": "",
-            "link": "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15650",
-            "severity": "Medium",
-            "fixedby": "1.1.14-r16"
-        }
-    ]
+  "image": "registry.gitlab.com/bikebilly/auto-devops-10-6/feature-branch:e7315ba964febb11bac8f5cd6ec433db8a3a1583",
+  "unapproved": ["CVE-2017-15650"],
+  "vulnerabilities": [
+    {
+      "featurename": "musl",
+      "featureversion": "1.1.14-r15",
+      "vulnerability": "CVE-2017-15650",
+      "namespace": "alpine:v3.4",
+      "description": "",
+      "link": "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15650",
+      "severity": "Medium",
+      "fixedby": "1.1.14-r16"
+    }
+  ]
 }

spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js

@@ -34,8 +34,8 @@ describe('Suggestion Diff component', () => {
       expect(vm.$el.querySelector('.qa-suggestion-diff-header')).not.toBeNull();
     });
 
-    it('renders a diff table', () => {
-      expect(vm.$el.querySelector('table.md-suggestion-diff')).not.toBeNull();
+    it('renders a diff table with syntax highlighting', () => {
+      expect(vm.$el.querySelector('.md-suggestion-diff.js-syntax-highlight.code')).not.toBeNull();
     });
 
     it('renders the oldLineNumber', () => {