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/inline_conflict_lines.js | |
| parent | 8cd6ffab51acade21f793103d4fedf6c04a20496 (diff) | |
Updates eslint vue plugin version
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js index 56d6678e1bd..7f078d420c4 100644 --- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js +++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js @@ -6,9 +6,12 @@ import Vue from 'vue'; global.mergeConflicts = global.mergeConflicts || {}; global.mergeConflicts.inlineConflictLines = Vue.extend({ + mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions], props: { - file: Object + file: { + type: Object, + required: true, + }, }, - mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions], }); })(window.gl || (window.gl = {})); |