resolve all no-plusplus eslint violationseslint-no-plusplus

27 files changed, 96 insertions, 96 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 107a7978a87..ee8639cd5c6 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, no-var, spaced-comment, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, no-unused-vars, no-else-return, prefer-template, quotes, comma-dangle, no-param-reassign, no-void, radix, keyword-spacing, space-before-blocks, brace-style, no-underscore-dangle, no-plusplus, no-return-assign, camelcase, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, no-var, spaced-comment, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, no-unused-vars, no-else-return, prefer-template, quotes, comma-dangle, no-param-reassign, no-void, radix, keyword-spacing, space-before-blocks, brace-style, no-underscore-dangle, no-return-assign, camelcase, padded-blocks */
 /* global Cookies */
 
 (function() {
@@ -339,7 +339,7 @@
       if (Cookies.get('frequently_used_emojis')) {
         frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
         ul = $("<ul class='clearfix emoji-menu-list frequent-emojis'>");
-        for (i = 0, len = frequentlyUsedEmojis.length; i < len; i++) {
+        for (i = 0, len = frequentlyUsedEmojis.length; i < len; i += 1) {
           emoji = frequentlyUsedEmojis[i];
           $(".emoji-menu-content [data-emoji='" + emoji + "']").closest('li').clone().appendTo(ul);
         }
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index 6711930622b..630fe084175 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, space-before-function-paren, max-len, no-plusplus */
+/* eslint-disable comma-dangle, space-before-function-paren, max-len */
 /* global Vue */
 /* global Sortable */
 
@@ -43,7 +43,7 @@
       issues () {
         this.$nextTick(() => {
           if (this.scrollHeight() <= this.listHeight() && this.list.issuesSize > this.list.issues.length) {
-            this.list.page++;
+            this.list.page += 1;
             this.list.getIssues(false);
           }
 
diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6
index fb13f529b11..a07271c7d11 100644
--- a/app/assets/javascripts/boards/models/list.js.es6
+++ b/app/assets/javascripts/boards/models/list.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable space-before-function-paren, no-underscore-dangle, class-methods-use-this, consistent-return, no-plusplus, prefer-const, space-in-parens, no-shadow, no-param-reassign, max-len, no-unused-vars */
+/* eslint-disable space-before-function-paren, no-underscore-dangle, class-methods-use-this, consistent-return, prefer-const, space-in-parens, no-shadow, no-param-reassign, max-len, no-unused-vars */
 /* global ListIssue */
 /* global ListLabel */
 
@@ -58,7 +58,7 @@ class List {
 
   nextPage () {
     if (this.issuesSize > this.issues.length) {
-      this.page++;
+      this.page += 1;
 
       return this.getIssues(false);
     }
@@ -94,7 +94,7 @@ class List {
 
   newIssue (issue) {
     this.addIssue(issue);
-    this.issuesSize++;
+    this.issuesSize += 1;
 
     return gl.boardService.newIssue(this.id, issue)
       .then((resp) => {
@@ -122,7 +122,7 @@ class List {
       }
 
       if (listFrom) {
-        this.issuesSize++;
+        this.issuesSize += 1;
         gl.boardService.moveIssue(issue.id, listFrom.id, this.id)
           .then(() => {
             listFrom.getIssues(false);
@@ -140,7 +140,7 @@ class List {
       const matchesRemove = removeIssue.id === issue.id;
 
       if (matchesRemove) {
-        this.issuesSize--;
+        this.issuesSize -= 1;
         issue.removeLabel(this.label);
       }
 
diff --git a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6
index 3723a2039f9..54c2b4ad369 100644
--- a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6
+++ b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6
@@ -1,10 +1,10 @@
-/* eslint-disable func-names, prefer-arrow-callback, no-unused-vars, no-plusplus */
+/* eslint-disable func-names, prefer-arrow-callback, no-unused-vars */
 /* global Vue */
 
 Vue.http.interceptors.push((request, next) => {
   Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
 
   next(function (response) {
-    Vue.activeResources--;
+    Vue.activeResources -= 1;
   });
 });
diff --git a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
index f47867fc3b0..dd24288571e 100644
--- a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, one-var, indent, space-before-function-paren, no-plusplus, no-lonely-if, no-continue, brace-style, max-len, quotes, semi */
+/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, one-var, indent, space-before-function-paren, no-lonely-if, no-continue, brace-style, max-len, quotes, semi */
 /* global Vue */
 /* global DiscussionMixins */
 /* global CommentsStore */
@@ -68,11 +68,11 @@
 
           let unresolvedDiscussionCount = 0;
 
-          for (let i = 0; i < discussionIdsInScope.length; i++) {
+          for (let i = 0; i < discussionIdsInScope.length; i += 1) {
             const discussionId = discussionIdsInScope[i];
             const discussion = discussions[discussionId];
             if (discussion && !discussion.isResolved()) {
-              unresolvedDiscussionCount++;
+              unresolvedDiscussionCount += 1;
             }
           }
 
@@ -109,7 +109,7 @@
         }
 
         let currentDiscussionFound = false;
-        for (let i = 0; i < discussionIdsInScope.length; i++) {
+        for (let i = 0; i < discussionIdsInScope.length; i += 1) {
           const discussionId = discussionIdsInScope[i];
           const discussion = discussions[discussionId];
 
@@ -170,7 +170,7 @@
           // If we are on the diffs tab, we don't scroll to the discussion itself, but to
           // 4 diff lines above it: the line the discussion was in response to + 3 context
           let prevEl;
-          for (let i = 0; i < 4; i++) {
+          for (let i = 0; i < 4; i += 1) {
             prevEl = $target.prev();
 
             // If the discussion doesn't have 4 lines above it, we'll have to do with fewer.
diff --git a/app/assets/javascripts/diff_notes/mixins/discussion.js.es6 b/app/assets/javascripts/diff_notes/mixins/discussion.js.es6
index a9ea18bf82b..3c08c222f46 100644
--- a/app/assets/javascripts/diff_notes/mixins/discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/mixins/discussion.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable object-shorthand, func-names, guard-for-in, no-restricted-syntax, comma-dangle, no-plusplus, no-param-reassign, max-len */
+/* eslint-disable object-shorthand, func-names, guard-for-in, no-restricted-syntax, comma-dangle, no-param-reassign, max-len */
 
 ((w) => {
   w.DiscussionMixins = {
@@ -13,7 +13,7 @@
           const discussion = this.discussions[discussionId];
 
           if (discussion.isResolved()) {
-            resolvedCount++;
+            resolvedCount += 1;
           }
         }
 
@@ -26,7 +26,7 @@
           const discussion = this.discussions[discussionId];
 
           if (!discussion.isResolved()) {
-            unresolvedCount++;
+            unresolvedCount += 1;
           }
         }
 
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js
index 56cb39be642..360b63748d0 100644
--- a/app/assets/javascripts/dropzone_input.js
+++ b/app/assets/javascripts/dropzone_input.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, one-var, no-var, one-var-declaration-per-line, no-unused-vars, camelcase, quotes, no-useless-concat, prefer-template, quote-props, comma-dangle, object-shorthand, consistent-return, no-plusplus, prefer-arrow-callback, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, one-var, no-var, one-var-declaration-per-line, no-unused-vars, camelcase, quotes, no-useless-concat, prefer-template, quote-props, comma-dangle, object-shorthand, consistent-return, prefer-arrow-callback, padded-blocks */
 /* global Dropzone */
 
 /*= require preview_markdown */
@@ -120,7 +120,7 @@
           if (item.type.indexOf("image") !== -1) {
             return item;
           }
-          i++;
+          i += 1;
         }
         return false;
       };
diff --git a/app/assets/javascripts/extensions/element.js.es6 b/app/assets/javascripts/extensions/element.js.es6
index 3f12ad9ff9f..90ab79305a7 100644
--- a/app/assets/javascripts/extensions/element.js.es6
+++ b/app/assets/javascripts/extensions/element.js.es6
@@ -1,5 +1,5 @@
 /* global Element */
-/* eslint-disable consistent-return, max-len, no-empty, no-plusplus, func-names */
+/* eslint-disable consistent-return, max-len, no-empty, func-names */
 
 Element.prototype.closest = Element.prototype.closest || function closest(selector, selectedElement = this) {
   if (!selectedElement) return;
@@ -14,7 +14,7 @@ Element.prototype.matches = Element.prototype.matches ||
   Element.prototype.webkitMatchesSelector ||
   function (s) {
     const matches = (this.document || this.ownerDocument).querySelectorAll(s);
-    let i = matches.length;
-    while (--i >= 0 && matches.item(i) !== this) {}
+    let i = matches.length - 1;
+    while (i >= 0 && matches.item(i) !== this) { i -= 1; }
     return i > -1;
   };
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js
index bb516b3d2df..6fc232ca1a0 100644
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -1,11 +1,11 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, space-before-blocks, prefer-rest-params, max-len, vars-on-top, no-plusplus, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, semi, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, padded-blocks, prefer-template, no-param-reassign, no-loop-func, no-extra-semi, keyword-spacing, no-mixed-operators */
+/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, space-before-blocks, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, semi, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, padded-blocks, prefer-template, no-param-reassign, no-loop-func, no-extra-semi, keyword-spacing, no-mixed-operators */
 /* global fuzzaldrinPlus */
 /* global Turbolinks */
 
 (function() {
   var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote,
     bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i += 1) { if (i in this && this[i] === item) return i; } return -1; };
 
   GitLabDropdownFilter = (function() {
     var ARROW_KEY_CODES, BLUR_KEYCODES, HAS_VALUE_CLASS;
@@ -494,7 +494,7 @@
       } else {
         var ul = document.createElement('ul');
 
-        for (var i = 0; i < html.length; i++) {
+        for (var i = 0; i < html.length; i += 1) {
           var el = html[i];
 
           if (el instanceof jQuery) {
diff --git a/app/assets/javascripts/graphs/stat_graph_contributors_util.js b/app/assets/javascripts/graphs/stat_graph_contributors_util.js
index 1982f4af939..ff217540b48 100644
--- a/app/assets/javascripts/graphs/stat_graph_contributors_util.js
+++ b/app/assets/javascripts/graphs/stat_graph_contributors_util.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, object-shorthand, no-var, one-var, camelcase, one-var-declaration-per-line, no-plusplus, comma-dangle, no-param-reassign, no-return-assign, quotes, prefer-arrow-callback, wrap-iife, consistent-return, no-unused-vars, max-len, no-cond-assign, no-else-return, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, object-shorthand, no-var, one-var, camelcase, one-var-declaration-per-line, comma-dangle, no-param-reassign, no-return-assign, quotes, prefer-arrow-callback, wrap-iife, consistent-return, no-unused-vars, max-len, no-cond-assign, no-else-return, padded-blocks, max-len */
 (function() {
   window.ContributorsStatGraphUtil = {
     parse_log: function(log) {
@@ -6,7 +6,7 @@
       total = {};
       by_author = {};
       by_email = {};
-      for (i = 0, len = log.length; i < len; i++) {
+      for (i = 0, len = log.length; i < len; i += 1) {
         entry = log[i];
         if (total[entry.date] == null) {
           this.add_date(entry.date, total);
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
index 6872186cd7f..59e80b4c4e4 100644
--- a/app/assets/javascripts/lib/utils/url_utility.js
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, one-var, one-var-declaration-per-line, no-void, no-plusplus, guard-for-in, no-restricted-syntax, prefer-template, quotes, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, one-var, one-var-declaration-per-line, no-void, guard-for-in, no-restricted-syntax, prefer-template, quotes, padded-blocks, max-len */
 (function() {
   (function(w) {
     var base;
@@ -22,7 +22,7 @@
         if (sParameterName[0] === sParam) {
           values.push(sParameterName[1].replace(/\+/g, ' '));
         }
-        i++;
+        i += 1;
       }
       return values;
     };
@@ -57,7 +57,7 @@
       return ((function() {
         var j, len, results;
         results = [];
-        for (j = 0, len = urlVariables.length; j < len; j++) {
+        for (j = 0, len = urlVariables.length; j < len; j += 1) {
           variables = urlVariables[j];
           if (variables.indexOf(param) === -1) {
             results.push(variables);
diff --git a/app/assets/javascripts/line_highlighter.js b/app/assets/javascripts/line_highlighter.js
index 9af89b79f84..16d78d0e179 100644
--- a/app/assets/javascripts/line_highlighter.js
+++ b/app/assets/javascripts/line_highlighter.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-use-before-define, no-underscore-dangle, no-param-reassign, prefer-template, quotes, comma-dangle, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, spaced-comment, radix, no-else-return, max-len, no-plusplus, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-use-before-define, no-underscore-dangle, no-param-reassign, prefer-template, quotes, comma-dangle, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, spaced-comment, radix, no-else-return, max-len, padded-blocks */
 
 // LineHighlighter
 //
@@ -144,7 +144,7 @@
       var i, lineNumber, ref, ref1, results;
       if (range[1]) {
         results = [];
-        for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? ++i : --i) {
+        for (lineNumber = i = ref = range[0], ref1 = range[1]; ref <= ref1 ? i <= ref1 : i >= ref1; lineNumber = ref <= ref1 ? (i += 1) : (i -= 1)) {
           results.push(this.highlightLine(lineNumber));
         }
         return results;
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
index 53b44007510..cf013c0501c 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, no-plusplus, camelcase, prefer-const, no-nested-ternary, no-continue, semi, func-call-spacing, no-spaced-func, padded-blocks, max-len */
+/* eslint-disable comma-dangle, object-shorthand, no-dupe-keys, no-param-reassign, camelcase, prefer-const, no-nested-ternary, no-continue, semi, func-call-spacing, no-spaced-func, padded-blocks, max-len */
 /* global Cookies */
 /* global Vue */
 
@@ -129,7 +129,7 @@
         this.checkLineLengths(linesObj);
       });
 
-      for (let i = 0, len = linesObj.left.length; i < len; i++) {
+      for (let i = 0, len = linesObj.left.length; i < len; i += 1) {
         file.parallelLines.push([
           linesObj.right[i],
           linesObj.left[i]
@@ -162,11 +162,11 @@
         if (file.type === CONFLICT_TYPES.TEXT) {
           file.sections.forEach((section) => {
             if (section.conflict) {
-              count++;
+              count += 1;
             }
           });
         } else {
-          count++;
+          count += 1;
         }
       });
 
@@ -257,12 +257,12 @@
       if (left.length !== right.length) {
         if (left.length > right.length) {
           const diff = left.length - right.length;
-          for (let i = 0; i < diff; i++) {
+          for (let i = 0; i < diff; i += 1) {
             right.push({ lineType: 'emptyLine', richText: '' });
           }
         } else {
           const diff = right.length - left.length;
-          for (let i = 0; i < diff; i++) {
+          for (let i = 0; i < diff; i += 1) {
             left.push({ lineType: 'emptyLine', richText: '' });
           }
         }
@@ -316,7 +316,7 @@
       const hasCommitMessage = $.trim(this.state.conflictsData.commitMessage).length;
       let unresolved = 0;
 
-      for (let i = 0, l = files.length; i < l; i++) {
+      for (let i = 0, l = files.length; i < l; i += 1) {
         let file = files[i];
 
         if (file.resolveMode === INTERACTIVE_RESOLVE_MODE) {
@@ -326,14 +326,14 @@
           // We only check for conflicts type 'text'
           // since conflicts `text_editor` can´t be resolved in interactive mode
           if (file.type === CONFLICT_TYPES.TEXT) {
-            for (let j = 0, k = file.sections.length; j < k; j++) {
+            for (let j = 0, k = file.sections.length; j < k; j += 1) {
               if (file.sections[j].conflict) {
-                numberConflicts++;
+                numberConflicts += 1;
               }
             }
 
             if (resolvedConflicts !== numberConflicts) {
-              unresolved++;
+              unresolved += 1;
             }
           }
         } else if (file.resolveMode === EDIT_RESOLVE_MODE) {
@@ -341,7 +341,7 @@
           // Unlikely to happen since switching to Edit mode saves content automatically.
           // Checking anyway in case the save strategy changes in the future
           if (!file.content) {
-            unresolved++;
+            unresolved += 1;
             continue;
           }
         }
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6
index 0305aeb07d9..26b326e1347 100644
--- a/app/assets/javascripts/merge_request_widget.js.es6
+++ b/app/assets/javascripts/merge_request_widget.js.es6
@@ -1,11 +1,11 @@
-/* eslint-disable max-len, no-var, func-names, space-before-function-paren, vars-on-top, no-plusplus, comma-dangle, no-return-assign, consistent-return, no-param-reassign, one-var, one-var-declaration-per-line, quotes, prefer-template, no-else-return, prefer-arrow-callback, no-unused-vars, no-underscore-dangle, no-shadow, no-mixed-operators, template-curly-spacing, camelcase, default-case, wrap-iife, semi, padded-blocks */
+/* eslint-disable max-len, no-var, func-names, space-before-function-paren, vars-on-top, comma-dangle, no-return-assign, consistent-return, no-param-reassign, one-var, one-var-declaration-per-line, quotes, prefer-template, no-else-return, prefer-arrow-callback, no-unused-vars, no-underscore-dangle, no-shadow, no-mixed-operators, template-curly-spacing, camelcase, default-case, wrap-iife, semi, padded-blocks */
 /* global notify */
 /* global notifyPermissions */
 /* global merge_request_widget */
 /* global Turbolinks */
 
 ((global) => {
-  var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+  var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i += 1) { if (i in this && this[i] === item) return i; } return -1; };
 
   const DEPLOYMENT_TEMPLATE = `<div class="mr-widget-heading" id="<%- id %>">
        <div class="ci_widget ci-success">
@@ -187,7 +187,7 @@
     };
 
     MergeRequestWidget.prototype.renderEnvironments = function(environments) {
-      for (let i = 0; i < environments.length; i++) {
+      for (let i = 0; i < environments.length; i += 1) {
         const environment = environments[i];
         if ($(`.mr-state-widget #${ environment.id }`).length) return;
         const $template = $(DEPLOYMENT_TEMPLATE);
diff --git a/app/assets/javascripts/network/branch_graph.js b/app/assets/javascripts/network/branch_graph.js
index 20a68780cd5..4297f9f3a44 100644
--- a/app/assets/javascripts/network/branch_graph.js
+++ b/app/assets/javascripts/network/branch_graph.js
@@ -1,4 +1,4 @@
-/* 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, space-before-blocks, 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, padded-blocks */
 /* global Raphael */
 
 (function() {
@@ -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;
@@ -399,7 +399,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");
diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js
index 29a323dd4c6..57769775e14 100644
--- a/app/assets/javascripts/new_branch_form.js
+++ b/app/assets/javascripts/new_branch_form.js
@@ -1,7 +1,7 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, one-var, space-before-blocks, prefer-rest-params, max-len, vars-on-top, no-plusplus, wrap-iife, consistent-return, comma-dangle, one-var-declaration-per-line, quotes, no-return-assign, prefer-arrow-callback, prefer-template, no-shadow, no-else-return, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, no-var, one-var, space-before-blocks, prefer-rest-params, max-len, vars-on-top, wrap-iife, consistent-return, comma-dangle, one-var-declaration-per-line, quotes, no-return-assign, prefer-arrow-callback, prefer-template, no-shadow, no-else-return, padded-blocks, max-len */
 (function() {
   var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
-    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i += 1) { if (i in this && this[i] === item) return i; } return -1; };
 
   this.NewBranchForm = (function() {
     function NewBranchForm(form, availableRefs) {
diff --git a/app/assets/javascripts/profile/gl_crop.js.es6 b/app/assets/javascripts/profile/gl_crop.js.es6
index b4b6da41f63..58cd522a1b3 100644
--- a/app/assets/javascripts/profile/gl_crop.js.es6
+++ b/app/assets/javascripts/profile/gl_crop.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-useless-escape, max-len, padded-blocks, quotes, no-var, no-underscore-dangle, func-names, space-before-function-paren, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, no-plusplus, new-parens, semi */
+/* eslint-disable no-useless-escape, max-len, padded-blocks, quotes, no-var, no-underscore-dangle, func-names, space-before-function-paren, no-unused-vars, no-return-assign, object-shorthand, one-var, one-var-declaration-per-line, comma-dangle, consistent-return, class-methods-use-this, new-parens, semi */
 
 ((global) => {
 
@@ -136,7 +136,7 @@
       var array, binary, i, k, len, v;
       binary = atob(dataURL.split(',')[1]);
       array = [];
-      for (k = i = 0, len = binary.length; i < len; k = ++i) {
+      for (k = i = 0, len = binary.length; i < len; k = (i += 1)) {
         v = binary[k];
         array.push(binary.charCodeAt(k));
       }
diff --git a/app/assets/javascripts/project_find_file.js b/app/assets/javascripts/project_find_file.js
index 1bd232314d0..c5b8fa56ca1 100644
--- a/app/assets/javascripts/project_find_file.js
+++ b/app/assets/javascripts/project_find_file.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, consistent-return, one-var, one-var-declaration-per-line, no-cond-assign, max-len, object-shorthand, no-param-reassign, comma-dangle, no-plusplus, prefer-template, no-unused-vars, no-return-assign, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, consistent-return, one-var, one-var-declaration-per-line, no-cond-assign, max-len, object-shorthand, no-param-reassign, comma-dangle, prefer-template, no-unused-vars, no-return-assign, padded-blocks */
 /* global fuzzaldrinPlus */
 
 (function() {
@@ -71,7 +71,7 @@
       var blobItemUrl, filePath, html, i, j, len, matches, results;
       this.element.find(".tree-table > tbody").empty();
       results = [];
-      for (i = j = 0, len = filePaths.length; j < len; i = ++j) {
+      for (i = j = 0, len = filePaths.length; j < len; i = (j += 1)) {
         filePath = filePaths[i];
         if (i === 20) {
           break;
@@ -92,7 +92,7 @@
       lastIndex = 0;
       highlightText = "";
       matchedChars = [];
-      for (j = 0, len = matches.length; j < len; j++) {
+      for (j = 0, len = matches.length; j < len; j += 1) {
         matchIndex = matches[j];
         unmatched = text.substring(lastIndex, matchIndex);
         if (unmatched) {
diff --git a/app/assets/javascripts/search_autocomplete.js.es6 b/app/assets/javascripts/search_autocomplete.js.es6
index 437f5dbbf7d..ab45e8eef02 100644
--- a/app/assets/javascripts/search_autocomplete.js.es6
+++ b/app/assets/javascripts/search_autocomplete.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, no-plusplus, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, padded-blocks, no-extra-semi, indent, max-len */
+/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, padded-blocks, no-extra-semi, indent, max-len */
 
 ((global) => {
 
@@ -105,7 +105,7 @@
         data = [];
         // List results
         firstCategory = true;
-        for (i = 0, len = response.length; i < len; i++) {
+        for (i = 0, len = response.length; i < len; i += 1) {
           suggestion = response[i];
           // Add group header before list each group
           if (lastCategory !== suggestion.category) {
@@ -309,7 +309,7 @@
     restoreOriginalState() {
       var i, input, inputs, len;
       inputs = Object.keys(this.originalState);
-      for (i = 0, len = inputs.length; i < len; i++) {
+      for (i = 0, len = inputs.length; i < len; i += 1) {
         input = inputs[i];
         this.getElement("#" + input).val(this.originalState[input]);
       }
@@ -330,7 +330,7 @@
       var i, input, inputs, len, results;
       inputs = Object.keys(this.originalState);
       results = [];
-      for (i = 0, len = inputs.length; i < len; i++) {
+      for (i = 0, len = inputs.length; i < len; i += 1) {
         input = inputs[i];
         // _location isnt a input
         if (input === '_location') {
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js
index 5ea00f408f4..b9a90faf7ff 100644
--- a/app/assets/javascripts/shortcuts.js
+++ b/app/assets/javascripts/shortcuts.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, prefer-arrow-callback, consistent-return, object-shorthand, no-unused-vars, one-var, one-var-declaration-per-line, no-plusplus, no-else-return, comma-dangle, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, prefer-arrow-callback, consistent-return, object-shorthand, no-unused-vars, one-var, one-var-declaration-per-line, no-else-return, comma-dangle, padded-blocks, max-len */
 /* global Mousetrap */
 /* global Turbolinks */
 /* global findFileURL */
@@ -51,7 +51,7 @@
           var i, l, len, results;
           if (location && location.length > 0) {
             results = [];
-            for (i = 0, len = location.length; i < len; i++) {
+            for (i = 0, len = location.length; i < len; i += 1) {
               l = location[i];
               results.push($(l).show());
             }
diff --git a/app/assets/javascripts/users/calendar.js b/app/assets/javascripts/users/calendar.js
index 578be7c3590..8979dbe203f 100644
--- a/app/assets/javascripts/users/calendar.js
+++ b/app/assets/javascripts/users/calendar.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, camelcase, vars-on-top, semi, keyword-spacing, no-plusplus, object-shorthand, comma-dangle, eqeqeq, no-mixed-operators, no-return-assign, newline-per-chained-call, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, prefer-template, quotes, no-unused-vars, no-else-return, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, camelcase, vars-on-top, semi, keyword-spacing, object-shorthand, comma-dangle, eqeqeq, no-mixed-operators, no-return-assign, newline-per-chained-call, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, prefer-template, quotes, no-unused-vars, no-else-return, padded-blocks, max-len */
 /* global d3 */
 /* global dateFormat */
 
@@ -28,7 +28,7 @@
 
       var days = gl.utils.getDayDifference(oneYearAgo, today);
 
-      for(var i = 0; i <= days; i++) {
+      for(var i = 0; i <= days; i += 1) {
         var date = new Date(oneYearAgo);
         date.setDate(date.getDate() + i);
 
@@ -39,7 +39,7 @@
         // or if is first object
         if ((day === 0 && i !== 0) || i === 0) {
           this.timestampsTmp.push([]);
-          group++;
+          group += 1;
         }
 
         var innerArray = this.timestampsTmp[group - 1];
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index d4b5e03aa35..967cdd92c73 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, one-var, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, max-len, one-var-declaration-per-line, vars-on-top, prefer-arrow-callback, consistent-return, comma-dangle, object-shorthand, no-shadow, no-unused-vars, no-plusplus, no-else-return, no-self-compare, prefer-template, no-unused-expressions, no-lonely-if, yoda, prefer-spread, no-void, camelcase, keyword-spacing, no-param-reassign, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, one-var, no-var, space-before-blocks, prefer-rest-params, wrap-iife, quotes, max-len, one-var-declaration-per-line, vars-on-top, prefer-arrow-callback, consistent-return, comma-dangle, object-shorthand, no-shadow, no-unused-vars, no-else-return, no-self-compare, prefer-template, no-unused-expressions, no-lonely-if, yoda, prefer-spread, no-void, camelcase, keyword-spacing, no-param-reassign, padded-blocks */
 /* global Vue */
 /* global Issuable */
 /* global ListUser */
@@ -116,7 +116,7 @@
                   showDivider = 0;
                   if (firstUser) {
                     // Move current user to the front of the list
-                    for (index = j = 0, len = users.length; j < len; index = ++j) {
+                    for (index = j = 0, len = users.length; j < len; index = (j += 1)) {
                       obj = users[index];
                       if (obj.username === firstUser) {
                         users.splice(index, 1);
@@ -278,7 +278,7 @@
                   if (firstUser) {
                     // Move current user to the front of the list
                     ref = data.results;
-                    for (index = j = 0, len = ref.length; j < len; index = ++j) {
+                    for (index = j = 0, len = ref.length; j < len; index = (j += 1)) {
                       obj = ref[index];
                       if (obj.username === firstUser) {
                         data.results.splice(index, 1);
diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6
index b3617a45bd4..54b6efc0f95 100644
--- a/spec/javascripts/activities_spec.js.es6
+++ b/spec/javascripts/activities_spec.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */
+/* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-shadow, max-len */
 
 /*= require js.cookie.js */
 /*= require jquery.endless-scroll.js */
@@ -39,14 +39,14 @@
       new gl.Activities();
     });
 
-    for(let i = 0; i < filters.length; i++) {
+    for(let i = 0; i < filters.length; i += 1) {
       ((i) => {
         describe(`when selecting ${getEventName(i)}`, () => {
           beforeEach(() => {
             $(getSelector(i)).click();
           });
 
-          for(let x = 0; x < filters.length; x++) {
+          for(let x = 0; x < filters.length; x += 1) {
             ((x) => {
               let shouldHighlight = i === x;
               let testName = shouldHighlight ? 'should highlight' : 'should not highlight';
diff --git a/spec/javascripts/gl_dropdown_spec.js.es6 b/spec/javascripts/gl_dropdown_spec.js.es6
index ce96571bd52..915eecb927f 100644
--- a/spec/javascripts/gl_dropdown_spec.js.es6
+++ b/spec/javascripts/gl_dropdown_spec.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, prefer-const, no-param-reassign, no-plusplus, semi, no-unused-expressions, arrow-spacing, max-len */
+/* eslint-disable comma-dangle, prefer-const, no-param-reassign, semi, no-unused-expressions, arrow-spacing, max-len */
 /* global Turbolinks */
 
 /*= require jquery */
@@ -30,7 +30,7 @@
       which: ARROW_KEYS[direction],
       keyCode: ARROW_KEYS[direction]
     });
-    i++;
+    i += 1;
     if (i <= steps) {
       navigateWithKeys(direction, steps, cb, i);
     } else {
diff --git a/spec/javascripts/labels_issue_sidebar_spec.js.es6 b/spec/javascripts/labels_issue_sidebar_spec.js.es6
index e3146559a4a..4f06893f365 100644
--- a/spec/javascripts/labels_issue_sidebar_spec.js.es6
+++ b/spec/javascripts/labels_issue_sidebar_spec.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-new, no-plusplus, object-curly-spacing, prefer-const, semi */
+/* eslint-disable no-new, object-curly-spacing, prefer-const, semi */
 /* global IssuableContext */
 /* global LabelsSelect */
 
@@ -29,12 +29,12 @@
         let LABELS_DATA = []
 
         if (req.url === '/root/test/labels.json') {
-          for (let i = 0; i < 10; i++) {
+          for (let i = 0; i < 10; i += 1) {
             LABELS_DATA.push({id: i, title: `test ${i}`, color: '#5CB85C'});
           }
         } else if (req.url === '/root/test/issues/2.json') {
           let tmp = []
-          for (let i = 0; i < saveLabelCount; i++) {
+          for (let i = 0; i < saveLabelCount; i += 1) {
             tmp.push({id: i, title: `test ${i}`, color: '#5CB85C'});
           }
           LABELS_DATA = {labels: tmp};
diff --git a/spec/javascripts/line_highlighter_spec.js b/spec/javascripts/line_highlighter_spec.js
index 31f516b41bf..0354a16c099 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, padded-blocks, max-len */
 /* global LineHighlighter */
 
 /*= require line_highlighter */
@@ -33,11 +33,11 @@
         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 @@
         });
         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 @@
             });
           });
           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;
diff --git a/spec/javascripts/subbable_resource_spec.js.es6 b/spec/javascripts/subbable_resource_spec.js.es6
index 6a70dd856a7..99f45850ea3 100644
--- a/spec/javascripts/subbable_resource_spec.js.es6
+++ b/spec/javascripts/subbable_resource_spec.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable max-len, arrow-parens, comma-dangle, no-plusplus */
+/* eslint-disable max-len, arrow-parens, comma-dangle */
 
 //= vue
 //= vue-resource
@@ -53,7 +53,7 @@
         this.MockResource.subscribe(callbacks.two);
         this.MockResource.subscribe(callbacks.three);
 
-        state.myprop++;
+        state.myprop += 1;
 
         this.MockResource.publish(state);