1 files changed, 12 insertions, 3 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 2cb238529aa..e4ed8111824 100644
--- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
+++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
@@ -11,9 +11,18 @@ import { __ } from '~/locale';
 
   global.mergeConflicts.diffFileEditor = Vue.extend({
     props: {
-      file: Object,
-      onCancelDiscardConfirmation: Function,
-      onAcceptDiscardConfirmation: Function
+      file: {
+        type: Object,
+        required: true,
+      },
+      onCancelDiscardConfirmation: {
+        type: Function,
+        required: true,
+      },
+      onAcceptDiscardConfirmation: {
+        type: Function,
+        required: true,
+      },
     },
     data() {
       return {