summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-02 06:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-02 06:08:01 +0000
commit8fb943c7df5f2b399caaeaebd6c00d0630bc763c (patch)
tree8d35d09078b03ff3db3a860babe8e6918eab8671 /app/assets/javascripts/vue_shared/components
parent47946d47f3d8906b622cb27605195ea0ffcb095c (diff)
downloadgitlab-ce-8fb943c7df5f2b399caaeaebd6c00d0630bc763c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
-rw-r--r--app/assets/javascripts/vue_shared/components/notes/system_note.vue4
1 files changed, 2 insertions, 2 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 0c4d75fb0ad..908f7196abf 100644
--- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue
@@ -54,8 +54,8 @@ export default {
};
},
computed: {
- ...mapGetters(['targetNoteHash']),
- ...mapState(['descriptionVersion', 'isLoadingDescriptionVersion']),
+ ...mapGetters(['targetNoteHash', 'descriptionVersion']),
+ ...mapState(['isLoadingDescriptionVersion']),
noteAnchorId() {
return `note_${this.note.id}`;
},