Merge branch 'master' into go-go-gadget-webpack

* master: (389 commits)
  Document "No gems fetched from git repositories" policy [ci skip]
  Typos
  Small gramatical tweaks
  Typos
  Added PHP & NPM doc
  Use `:empty_project` where possible in request specs
  Add caching of droplab ajax requests
  Use `:empty_project` where possible in model specs
  Revert 3f17f29a
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...

1 files changed, 11 insertions, 12 deletions

diff --git a/spec/javascripts/line_highlighter_spec.js b/spec/javascripts/line_highlighter_spec.js
index be80e06af53..8b196f7720f 100644
--- a/spec/javascripts/line_highlighter_spec.js
+++ b/spec/javascripts/line_highlighter_spec.js
@@ -1,4 +1,4 @@
-/* eslint-disable space-before-function-paren, no-var, no-param-reassign, quotes, prefer-template, no-else-return, new-cap, dot-notation, no-return-assign, comma-dangle, no-new, one-var, one-var-declaration-per-line, no-plusplus, jasmine/no-spec-dupes, no-underscore-dangle, padded-blocks, max-len */
+/* eslint-disable space-before-function-paren, no-var, no-param-reassign, quotes, prefer-template, no-else-return, new-cap, dot-notation, no-return-assign, comma-dangle, no-new, one-var, one-var-declaration-per-line, jasmine/no-spec-dupes, no-underscore-dangle, max-len */
 /* global LineHighlighter */
 
 require('~/line_highlighter');
@@ -33,11 +33,11 @@ require('~/line_highlighter');
         return expect($('#LC13')).toHaveClass(this.css);
       });
       it('highlights a range of lines given in the URL hash', function() {
-        var i, line, results;
+        var line, results;
         new LineHighlighter('#L5-25');
         expect($("." + this.css).length).toBe(21);
         results = [];
-        for (line = i = 5; i <= 25; line = ++i) {
+        for (line = 5; line <= 25; line += 1) {
           results.push(expect($("#LC" + line)).toHaveClass(this.css));
         }
         return results;
@@ -124,27 +124,27 @@ require('~/line_highlighter');
         });
         describe('with existing single-line highlight', function() {
           it('uses existing line as last line when target is lesser', function() {
-            var i, line, results;
+            var line, results;
             clickLine(20);
             clickLine(15, {
               shiftKey: true
             });
             expect($("." + this.css).length).toBe(6);
             results = [];
-            for (line = i = 15; i <= 20; line = ++i) {
+            for (line = 15; line <= 20; line += 1) {
               results.push(expect($("#LC" + line)).toHaveClass(this.css));
             }
             return results;
           });
           return it('uses existing line as first line when target is greater', function() {
-            var i, line, results;
+            var line, results;
             clickLine(5);
             clickLine(10, {
               shiftKey: true
             });
             expect($("." + this.css).length).toBe(6);
             results = [];
-            for (line = i = 5; i <= 10; line = ++i) {
+            for (line = 5; line <= 10; line += 1) {
               results.push(expect($("#LC" + line)).toHaveClass(this.css));
             }
             return results;
@@ -160,25 +160,25 @@ require('~/line_highlighter');
             });
           });
           it('uses target as first line when it is less than existing first line', function() {
-            var i, line, results;
+            var line, results;
             clickLine(5, {
               shiftKey: true
             });
             expect($("." + this.css).length).toBe(6);
             results = [];
-            for (line = i = 5; i <= 10; line = ++i) {
+            for (line = 5; line <= 10; line += 1) {
               results.push(expect($("#LC" + line)).toHaveClass(this.css));
             }
             return results;
           });
           return it('uses target as last line when it is greater than existing first line', function() {
-            var i, line, results;
+            var line, results;
             clickLine(15, {
               shiftKey: true
             });
             expect($("." + this.css).length).toBe(6);
             results = [];
-            for (line = i = 10; i <= 15; line = ++i) {
+            for (line = 10; line <= 15; line += 1) {
               results.push(expect($("#LC" + line)).toHaveClass(this.css));
             }
             return results;
@@ -227,5 +227,4 @@ require('~/line_highlighter');
       });
     });
   });
-
 }).call(this);