Commit 8d84b307 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ee-parallel-diff-view' into 'master'

Fix EE differences in parallel_diff_view.vue

Closes #10007

See merge request gitlab-org/gitlab-ee!9825
parents b69dfb7e d2873c49
<script>
import { mapGetters } from 'vuex';
import draftCommentsMixin from 'ee_else_ce/diffs/mixins/draft_comments';
import parallelDiffTableRow from './parallel_diff_table_row.vue';
import parallelDiffCommentRow from './parallel_diff_comment_row.vue';
// eslint-disable-next-line import/order
import ParallelDraftCommentRow from 'ee/batch_comments/components/parallel_draft_comment_row.vue';
export default {
components: {
parallelDiffTableRow,
parallelDiffCommentRow,
ParallelDraftCommentRow,
ParallelDraftCommentRow: () =>
import('ee_component/batch_comments/components/parallel_draft_comment_row.vue'),
},
mixins: [draftCommentsMixin],
props: {
diffFile: {
type: Object,
......@@ -29,7 +29,6 @@ export default {
},
computed: {
...mapGetters('diffs', ['commitId']),
...mapGetters('batchComments', ['shouldRenderParallelDraftRow', 'draftForLine']),
diffLinesLength() {
return this.diffLines.length;
},
......
export default {
computed: {
shouldRenderDraftRow: () => () => false,
shouldRenderParallelDraftRow: () => () => false,
draftForLine: () => () => ({}),
},
};
......@@ -2,6 +2,10 @@ import { mapGetters } from 'vuex';
export default {
computed: {
...mapGetters('batchComments', ['shouldRenderDraftRow', 'draftForLine']),
...mapGetters('batchComments', [
'shouldRenderDraftRow',
'shouldRenderParallelDraftRow',
'draftForLine',
]),
},
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment