diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-11 12:49:47 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-11 17:36:54 +0300 |
commit | 647a4d6a3bac6eb8380dc0fcba03f0524f6de27d (patch) | |
tree | 3dd2e4a9252c7d0cde388a00ab03c39bed4c8f71 /app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | |
parent | 8cd6ffab51acade21f793103d4fedf6c04a20496 (diff) |
Updates eslint vue plugin version
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/diff_file_editor.js')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | 15 |
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 { |