From 80f61b4035607d7cd87de993b8f5e996bde3481f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 18 Sep 2019 14:02:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/merge_conflicts/components')

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) {
-- 
cgit v1.2.1