diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 03:10:15 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 03:10:15 +0000 |
commit | b908e6171374991b93fd9cb3949dcc65b5a713c2 (patch) | |
tree | f89dd0e7a509e67c4f022b70e0c7ed73bbb59892 /app/assets/javascripts/vue_shared/components/notes | |
parent | 5781a4966047232d4725f9ee4769c4bd5aed9b26 (diff) | |
download | gitlab-ce-b908e6171374991b93fd9cb3949dcc65b5a713c2.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/notes')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/notes/system_note.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue index 908f7196abf..4ad382ed888 100644 --- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue +++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue @@ -54,7 +54,7 @@ export default { }; }, computed: { - ...mapGetters(['targetNoteHash', 'descriptionVersion']), + ...mapGetters(['targetNoteHash', 'descriptionVersions']), ...mapState(['isLoadingDescriptionVersion']), noteAnchorId() { return `note_${this.note.id}`; @@ -81,6 +81,9 @@ export default { .children().length > MAX_VISIBLE_COMMIT_LIST_COUNT ); }, + descriptionVersion() { + return this.descriptionVersions[this.note.description_version_id]; + }, }, mounted() { initMRPopovers(this.$el.querySelectorAll('.gfm-merge_request')); |