diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/diffs/mixins/draft_comments.js | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/diffs/mixins/draft_comments.js')
-rw-r--r-- | app/assets/javascripts/diffs/mixins/draft_comments.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/diffs/mixins/draft_comments.js b/app/assets/javascripts/diffs/mixins/draft_comments.js index b6c9b132aeb..693b4a84694 100644 --- a/app/assets/javascripts/diffs/mixins/draft_comments.js +++ b/app/assets/javascripts/diffs/mixins/draft_comments.js @@ -1,12 +1,17 @@ +import { mapGetters } from 'vuex'; + export default { computed: { - shouldRenderDraftRow: () => () => false, - shouldRenderParallelDraftRow: () => () => false, - draftForLine: () => () => ({}), + ...mapGetters('batchComments', [ + 'shouldRenderDraftRow', + 'shouldRenderParallelDraftRow', + 'draftForLine', + 'draftsForFile', + 'hasParallelDraftLeft', + 'hasParallelDraftRight', + ]), imageDiscussions() { - return this.diffFile.discussions; + return this.diffFile.discussions.concat(this.draftsForFile(this.diffFile.file_hash)); }, - hasParallelDraftLeft: () => () => false, - hasParallelDraftRight: () => () => false, }, }; |