Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 9 insertions, 4 deletions

diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 3b4e21ab61b..676c9a3c7bc 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -96,10 +96,10 @@ export default {
       required: false,
       default: false,
     },
-    hasCodequalityChanges: {
-      type: Boolean,
+    codequalityDiff: {
+      type: Array,
       required: false,
-      default: false,
+      default: () => [],
     },
   },
   data() {
@@ -333,7 +333,12 @@ export default {
         data-track-property="diff_copy_file"
       />
 
-      <code-quality-badge v-if="hasCodequalityChanges" class="gl-mr-2" />
+      <code-quality-badge
+        v-if="codequalityDiff.length"
+        :file-name="filePath"
+        :codequality-diff="codequalityDiff"
+        class="gl-mr-2"
+      />
 
       <small v-if="isModeChanged" ref="fileMode" class="mr-1">
         {{ diffFile.a_mode }} → {{ diffFile.b_mode }}