Merge branch 'markrian-master-patch-57896' into 'master'

Fix static analysis of diff_row.vue

See merge request gitlab-org/gitlab!64942

app/assets/javascripts/diffs/components/diff_row.vue

@@ -155,6 +155,7 @@ export default {
 };
 </script>
 
+<!-- eslint-disable-next-line vue/no-deprecated-functional-template -->
 <template functional>
   <div :class="$options.classNameMap(props)" class="diff-grid-row diff-tr line_holder">
     <div