diff options
author | Felipe Artur <fcardozo@gitlab.com> | 2018-07-27 18:25:53 +0000 |
---|---|---|
committer | Felipe Artur <fcardozo@gitlab.com> | 2018-07-27 18:25:53 +0000 |
commit | 0cf823558887aaf2ad041473ed9961755d5d5f3b (patch) | |
tree | cafd8d35271ddad4890ce05c88075816f8733e01 /app/assets/javascripts/diffs/components/diff_line_gutter_content.vue | |
parent | 923b26133b8d04e8c4da4183b8f0382eefcc8147 (diff) | |
parent | d1f09ec7cdab3b6892b1006b8c382c08be4cd9e0 (diff) | |
download | gitlab-ce-0cf823558887aaf2ad041473ed9961755d5d5f3b.tar.gz |
Merge branch '11-1-3-stable-fixes-mr-refactor-regressions' into '11-1-stable-patch-3'11-1-stable-patch-3
MR refactor fixes for 11.1.3
See merge request gitlab-org/gitlab-ce!20878
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_line_gutter_content.vue | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue index ad838a32518..d184a76f038 100644 --- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue +++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue @@ -71,13 +71,18 @@ export default { required: false, default: false, }, + discussions: { + type: Array, + required: false, + default: () => [], + }, }, computed: { ...mapState({ diffViewType: state => state.diffs.diffViewType, diffFiles: state => state.diffs.diffFiles, }), - ...mapGetters(['isLoggedIn', 'discussionsByLineCode']), + ...mapGetters(['isLoggedIn']), lineHref() { return this.lineCode ? `#${this.lineCode}` : '#'; }, @@ -87,24 +92,19 @@ export default { this.showCommentButton && !this.isMatchLine && !this.isContextLine && - !this.hasDiscussions && - !this.isMetaLine + !this.isMetaLine && + !this.hasDiscussions ); }, - discussions() { - return this.discussionsByLineCode[this.lineCode] || []; - }, hasDiscussions() { return this.discussions.length > 0; }, shouldShowAvatarsOnGutter() { - let render = this.hasDiscussions && this.showCommentButton; - if (!this.lineType && this.linePosition === LINE_POSITION_RIGHT) { - render = false; + return false; } - return render; + return this.hasDiscussions && this.showCommentButton; }, }, methods: { @@ -189,7 +189,6 @@ export default { </button> <a v-if="lineNumber" - v-once :data-linenumber="lineNumber" :href="lineHref" > |