Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
index a62ebe23646..70b18d9728d 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-useless-computed-key, object-shorthand, no-param-reassign */
+/* eslint-disable no-param-reassign */
 /* global ace */
 
 import Vue from 'vue';
@@ -42,7 +42,7 @@ import getModeByFileExtension from '~/lib/utils/ace_utils';
       },
     },
     watch: {
-      ['file.showEditor'](val) {
+      'file.showEditor': function showEditorWatcher(val) {
         this.resetEditorContent();
 
         if (!val || this.fileLoaded || this.loading) {
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
index 88bc0940741..e7fcc183715 100644
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
@@ -1,4 +1,4 @@
-/* eslint-disable object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue */
+/* eslint-disable no-param-reassign, camelcase, no-nested-ternary, no-continue */
 
 import $ from 'jquery';
 import Vue from 'vue';
@@ -31,7 +31,7 @@ import { s__ } from '~/locale';
       hasError: false,
       isSubmitting: false,
       isParallel: diffViewType === VIEW_TYPES.PARALLEL,
-      diffViewType: diffViewType,
+      diffViewType,
       conflictsData: {},
     },
 
@@ -188,7 +188,7 @@ import { s__ } from '~/locale';
 
     getHeadHeaderLine(id) {
       return {
-        id: id,
+        id,
         richText: HEAD_HEADER_TEXT,
         buttonTitle: HEAD_BUTTON_TITLE,
         type: 'new',
@@ -233,7 +233,7 @@ import { s__ } from '~/locale';
 
     getOriginHeaderLine(id) {
       return {
-        id: id,
+        id,
         richText: ORIGIN_HEADER_TEXT,
         buttonTitle: ORIGIN_BUTTON_TITLE,
         type: 'old',