Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 7 deletions

diff --git a/app/assets/javascripts/helpers/diffs_helper.js b/app/assets/javascripts/helpers/diffs_helper.js
index 9695d01ad3d..d2b8cb11fe0 100644
--- a/app/assets/javascripts/helpers/diffs_helper.js
+++ b/app/assets/javascripts/helpers/diffs_helper.js
@@ -1,9 +1,9 @@
 export function hasInlineLines(diffFile) {
-  return diffFile?.highlighted_diff_lines?.length > 0; /* eslint-disable-line camelcase */
+  return diffFile?.highlighted_diff_lines?.length > 0;
 }
 
 export function hasParallelLines(diffFile) {
-  return diffFile?.parallel_diff_lines?.length > 0; /* eslint-disable-line camelcase */
+  return diffFile?.parallel_diff_lines?.length > 0;
 }
 
 export function isSingleViewStyle(diffFile) {
@@ -11,9 +11,5 @@ export function isSingleViewStyle(diffFile) {
 }
 
 export function hasDiff(diffFile) {
-  return (
-    hasInlineLines(diffFile) ||
-    hasParallelLines(diffFile) ||
-    !diffFile?.blob?.readable_text /* eslint-disable-line camelcase */
-  );
+  return hasInlineLines(diffFile) || hasParallelLines(diffFile) || !diffFile?.blob?.readable_text;
 }