resolve all semi and no-extra-semi eslint violations

4 files changed, 13 insertions, 13 deletions

diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
index f95b079c972..671816c5aa4 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, prefer-const, no-new, padded-blocks, no-param-reassign, semi, max-len */
+/* eslint-disable comma-dangle, quote-props, no-useless-computed-key, object-shorthand, prefer-const, no-new, padded-blocks, no-param-reassign, max-len */
 /* global Vue */
 /* global ace */
 /* global Flash */
@@ -19,7 +19,7 @@
         loading: false,
         fileLoaded: false,
         originalContent: '',
-      }
+      };
     },
     computed: {
       classObject() {
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
index 8df3170edac..468573a70d3 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_service.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-param-reassign, comma-dangle, no-extra-semi, padded-blocks */
+/* eslint-disable no-param-reassign, comma-dangle, padded-blocks */
 
 ((global) => {
   global.mergeConflicts = global.mergeConflicts || {};
@@ -25,7 +25,7 @@
         method: 'POST'
       });
     }
-  };
+  }
 
   global.mergeConflicts.mergeConflictsService = mergeConflictsService;
 
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 cf013c0501c..cc256af37f0 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, 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, func-call-spacing, no-spaced-func, padded-blocks, max-len */
 /* global Cookies */
 /* global Vue */
 
@@ -89,7 +89,7 @@
 
           this.decorateLineForInlineView(line, id, conflict);
           file.inlineLines.push(line);
-        })
+        });
 
         if (conflict) {
           file.inlineLines.push(this.getOriginHeaderLine(id));
@@ -321,7 +321,7 @@
 
         if (file.resolveMode === INTERACTIVE_RESOLVE_MODE) {
           let numberConflicts = 0;
-          let resolvedConflicts = Object.keys(file.resolutionData).length
+          let resolvedConflicts = Object.keys(file.resolutionData).length;
 
           // We only check for conflicts type 'text'
           // since conflicts `text_editor` can´t be resolved in interactive mode
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
index 83520702f9b..a2d90f9ba47 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable new-cap, comma-dangle, no-new, semi */
+/* eslint-disable new-cap, comma-dangle, no-new */
 /* global Vue */
 /* global Flash */
 
@@ -29,10 +29,10 @@ $(() => {
       'parallel-conflict-lines': gl.mergeConflicts.parallelConflictLines
     },
     computed: {
-      conflictsCountText() { return mergeConflictsStore.getConflictsCountText() },
-      readyToCommit() { return mergeConflictsStore.isReadyToCommit() },
-      commitButtonText() { return mergeConflictsStore.getCommitButtonText() },
-      showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent() }
+      conflictsCountText() { return mergeConflictsStore.getConflictsCountText(); },
+      readyToCommit() { return mergeConflictsStore.isReadyToCommit(); },
+      commitButtonText() { return mergeConflictsStore.getCommitButtonText(); },
+      showDiffViewTypeSwitcher() { return mergeConflictsStore.fileTextTypePresent(); }
     },
     created() {
       mergeConflictsService
@@ -88,5 +88,5 @@ $(() => {
           });
       }
     }
-  })
+  });
 });