diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 06:08:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 06:08:01 +0000 |
commit | 8fb943c7df5f2b399caaeaebd6c00d0630bc763c (patch) | |
tree | 8d35d09078b03ff3db3a860babe8e6918eab8671 /app/assets/javascripts | |
parent | 47946d47f3d8906b622cb27605195ea0ffcb095c (diff) | |
download | gitlab-ce-8fb943c7df5f2b399caaeaebd6c00d0630bc763c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/notes/stores/getters.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/notes/system_note.vue | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index 4f8ff8240b2..3a1e795cff4 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -28,6 +28,8 @@ export const getUserData = state => state.userData || {}; export const getUserDataByProp = state => prop => state.userData && state.userData[prop]; +export const descriptionVersion = state => state.descriptionVersion; + export const notesById = state => state.discussions.reduce((acc, note) => { note.notes.every(n => Object.assign(acc, { [n.id]: n })); 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}`; }, |