Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 6 insertions, 7 deletions

diff --git a/app/assets/javascripts/syntax_highlight.js b/app/assets/javascripts/syntax_highlight.js
index 37f3dd4b496..474b5132bc6 100644
--- a/app/assets/javascripts/syntax_highlight.js
+++ b/app/assets/javascripts/syntax_highlight.js
@@ -1,4 +1,4 @@
-/* eslint-disable consistent-return, no-else-return */
+/* eslint-disable consistent-return */
 
 import $ from 'jquery';
 
@@ -16,11 +16,10 @@ export default function syntaxHighlight(el) {
   if ($(el).hasClass('js-syntax-highlight')) {
     // Given the element itself, apply highlighting
     return $(el).addClass(gon.user_color_scheme);
-  } else {
-    // Given a parent element, recurse to any of its applicable children
-    const $children = $(el).find('.js-syntax-highlight');
-    if ($children.length) {
-      return syntaxHighlight($children);
-    }
+  }
+  // Given a parent element, recurse to any of its applicable children
+  const $children = $(el).find('.js-syntax-highlight');
+  if ($children.length) {
+    return syntaxHighlight($children);
   }
 }