Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 5 deletions

diff --git a/spec/javascripts/syntax_highlight_spec.js b/spec/javascripts/syntax_highlight_spec.js
index 5438368ccbe..99c47fa31d4 100644
--- a/spec/javascripts/syntax_highlight_spec.js
+++ b/spec/javascripts/syntax_highlight_spec.js
@@ -1,11 +1,10 @@
-/* eslint-disable no-var, no-return-assign */
+/* eslint-disable no-return-assign */
 
 import $ from 'jquery';
 import syntaxHighlight from '~/syntax_highlight';
 
 describe('Syntax Highlighter', function() {
-  var stubUserColorScheme;
-  stubUserColorScheme = function(value) {
+  const stubUserColorScheme = function(value) {
     if (window.gon == null) {
       window.gon = {};
     }
@@ -40,9 +39,8 @@ describe('Syntax Highlighter', function() {
     });
 
     it('prevents an infinite loop when no matches exist', function() {
-      var highlight;
       setFixtures('<div></div>');
-      highlight = function() {
+      const highlight = function() {
         return syntaxHighlight($('div'));
       };