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
  ...

3 files changed, 11 insertions, 16 deletions

diff --git a/app/assets/javascripts/network/branch_graph.js b/app/assets/javascripts/network/branch_graph.js
index 20a68780cd5..a7ccd03b60c 100644
--- a/app/assets/javascripts/network/branch_graph.js
+++ b/app/assets/javascripts/network/branch_graph.js
@@ -1,8 +1,8 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, comma-dangle, one-var, one-var-declaration-per-line, no-mixed-operators, new-cap, no-plusplus, no-loop-func, no-floating-decimal, consistent-return, no-unused-vars, prefer-template, prefer-arrow-callback, camelcase, max-len, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, comma-dangle, one-var, one-var-declaration-per-line, no-mixed-operators, new-cap, no-loop-func, no-floating-decimal, consistent-return, no-unused-vars, prefer-template, prefer-arrow-callback, camelcase, max-len */
 /* global Raphael */
 
 (function() {
-  var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+  var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
 
   this.BranchGraph = (function() {
     function BranchGraph(element1, options1) {
@@ -53,7 +53,7 @@
       this.top = this.r.set();
       this.barHeight = Math.max(this.graphHeight, this.unitTime * this.days.length + 320);
       ref = this.commits;
-      for (j = 0, len = ref.length; j < len; j++) {
+      for (j = 0, len = ref.length; j < len; j += 1) {
         c = ref[j];
         if (c.id in this.parents) {
           c.isParent = true;
@@ -68,7 +68,7 @@
       var c, j, len, p, ref, results;
       ref = this.commits;
       results = [];
-      for (j = 0, len = ref.length; j < len; j++) {
+      for (j = 0, len = ref.length; j < len; j += 1) {
         c = ref[j];
         this.mtime = Math.max(this.mtime, c.time);
         this.mspace = Math.max(this.mspace, c.space);
@@ -76,7 +76,7 @@
           var l, len1, ref1, results1;
           ref1 = c.parents;
           results1 = [];
-          for (l = 0, len1 = ref1.length; l < len1; l++) {
+          for (l = 0, len1 = ref1.length; l < len1; l += 1) {
             p = ref1[l];
             this.parents[p[0]] = true;
             results1.push(this.mspace = Math.max(this.mspace, p[1]));
@@ -96,7 +96,7 @@
         // Skipping a few colors in the spectrum to get more contrast between colors
         Raphael.getColor();
         Raphael.getColor();
-        results.push(k++);
+        results.push(k += 1);
       }
       return results;
     };
@@ -113,7 +113,7 @@
         fill: "#444"
       });
       ref = this.days;
-      for (mm = j = 0, len = ref.length; j < len; mm = ++j) {
+      for (mm = j = 0, len = ref.length; j < len; mm = (j += 1)) {
         day = ref[mm];
         if (cuday !== day[0] || cumonth !== day[1]) {
           // Dates
@@ -286,7 +286,7 @@
       r = this.r;
       ref = commit.parents;
       results = [];
-      for (i = j = 0, len = ref.length; j < len; i = ++j) {
+      for (i = j = 0, len = ref.length; j < len; i = (j += 1)) {
         parent = ref[i];
         parentCommit = this.preparedCommits[parent[0]];
         parentY = this.offsetY + this.unitTime * parentCommit.time;
@@ -346,7 +346,6 @@
     };
 
     return BranchGraph;
-
   })();
 
   Raphael.prototype.commitTooltip = function(x, y, commit) {
@@ -399,7 +398,7 @@
     words = content.split(" ");
     x = 0;
     s = [];
-    for (j = 0, len = words.length; j < len; j++) {
+    for (j = 0, len = words.length; j < len; j += 1) {
       word = words[j];
       if (x + (word.length * letterWidth) > width) {
         s.push("\n");
@@ -422,5 +421,4 @@
       y: h
     });
   };
-
 }).call(this);
diff --git a/app/assets/javascripts/network/network.js b/app/assets/javascripts/network/network.js
index 2367d2497b2..37bf6436fd1 100644
--- a/app/assets/javascripts/network/network.js
+++ b/app/assets/javascripts/network/network.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, quote-props, prefer-template, comma-dangle, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, quote-props, prefer-template, comma-dangle, max-len */
 /* global BranchGraph */
 
 (function() {
@@ -16,7 +16,5 @@
     }
 
     return Network;
-
   })();
-
 }).call(this);
diff --git a/app/assets/javascripts/network/network_bundle.js b/app/assets/javascripts/network/network_bundle.js
index 1e91911c02c..b4491354472 100644
--- a/app/assets/javascripts/network/network_bundle.js
+++ b/app/assets/javascripts/network/network_bundle.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, prefer-arrow-callback, quotes, no-var, vars-on-top, camelcase, comma-dangle, consistent-return, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, prefer-arrow-callback, quotes, no-var, vars-on-top, camelcase, comma-dangle, consistent-return, max-len */
 /* global Network */
 /* global ShortcutsNetwork */
 
@@ -19,5 +19,4 @@ requireAll(require.context('.', false, /^\.\/(?!network_bundle).*\.(js|es6)$/));
     });
     return new ShortcutsNetwork(network_graph.branch_graph);
   });
-
 }).call(this);