summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
diff options
context:
space:
mode:
authorAndré Luís <aluis@gitlab.com>2018-07-31 01:51:23 +0100
committerAndré Luís <aluis@gitlab.com>2018-08-01 13:45:16 +0100
commit09c1b008eb4b90c0a8becdf7ebb5723a8bd05468 (patch)
tree136f242cc97e9c696b0f514f28cc5607619a45a8 /app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
parente3eab3661997a3a698d0763f0625add6413b4732 (diff)
downloadgitlab-ce-09c1b008eb4b90c0a8becdf7ebb5723a8bd05468.tar.gz
Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"
This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521.
Diffstat (limited to 'app/assets/javascripts/diffs/components/inline_diff_comment_row.vue')
-rw-r--r--app/assets/javascripts/diffs/components/inline_diff_comment_row.vue7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue b/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
index a6f011ff31e..ca265dd892c 100644
--- a/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_comment_row.vue
@@ -26,16 +26,13 @@ export default {
...mapState({
diffLineCommentForms: state => state.diffs.diffLineCommentForms,
}),
- ...mapGetters('diffs', ['discussionsByLineCode']),
+ ...mapGetters(['discussionsByLineCode']),
discussions() {
return this.discussionsByLineCode[this.line.lineCode] || [];
},
className() {
return this.discussions.length ? '' : 'js-temp-notes-holder';
},
- hasCommentForm() {
- return this.diffLineCommentForms[this.line.lineCode];
- },
},
};
</script>
@@ -56,7 +53,7 @@ export default {
:discussions="discussions"
/>
<diff-line-note-form
- v-if="hasCommentForm"
+ v-if="diffLineCommentForms[line.lineCode]"
:diff-file-hash="diffFileHash"
:line="line"
:note-target-line="line"