diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 14:36:40 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 14:36:40 +0100 |
commit | 3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb (patch) | |
tree | cabfdabca18169433d11c127ee82f12e6f918a46 /app/assets/javascripts/merge_conflicts | |
parent | 75f692748d853d38494ba93ff15f98475b6c2da7 (diff) | |
parent | 69228d796c26e71da894c18f157c7f95022f0b6b (diff) | |
download | gitlab-ce-3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb.tar.gz |
Merge branch 'master' into gl-remove-window-scope
* master:
Add documentation: Overview of Frontend Testing
Resolve "Add `/confidential` quick action for issues"
i18n: externalize strings from 'app/views/award_emoji'
Fix broken tests due to bad conflict resolution
Updates eslint rules
Documentation does not need an exception to be picked
Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
[Rails5] Fix `storage_counter` helper
Adjust SQL and transaction Prometheus buckets
Updates eslint vue plugin version
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
3 files changed, 22 insertions, 7 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 { 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 5bae6d63df6..827cf5f478d 100644 --- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js +++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js @@ -8,9 +8,12 @@ import utilsMixin from '../mixins/line_conflict_utils'; global.mergeConflicts = global.mergeConflicts || {}; global.mergeConflicts.inlineConflictLines = Vue.extend({ + mixins: [utilsMixin, actionsMixin], props: { - file: Object, + file: { + type: Object, + required: true, + }, }, - mixins: [utilsMixin, actionsMixin], }); })(window.gl || (window.gl = {})); diff --git a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js index 0572a76f2ed..57e73e38d88 100644 --- a/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js +++ b/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js @@ -8,10 +8,13 @@ import utilsMixin from '../mixins/line_conflict_utils'; global.mergeConflicts = global.mergeConflicts || {}; global.mergeConflicts.parallelConflictLines = Vue.extend({ + mixins: [utilsMixin, actionsMixin], props: { - file: Object + file: { + type: Object, + required: true, + }, }, - mixins: [utilsMixin, actionsMixin], template: ` <table> <tr class="line_holder parallel" v-for="section in file.parallelLines"> |