diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
| commit | 3c99d8308a481b3f6edb002912ffc4d760b7fb64 (patch) | |
| tree | 73555ed44c63103ae57836dd00587e45d084dff2 /app/assets/javascripts/notes/components/notes_app.vue | |
| parent | 0336dc438b6faab575df996364076b57e388cc27 (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-gl-ui-progress-bar.tar.gz | |
Merge branch 'master' into 'gl-ui-progress-bar'gl-ui-progress-bar
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'app/assets/javascripts/notes/components/notes_app.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/notes_app.vue | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index b0faa443a18..7514ce8a1eb 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -54,7 +54,13 @@ export default { }; }, computed: { - ...mapGetters(['isNotesFetched', 'discussions', 'getNotesDataByProp', 'discussionCount', 'isLoading']), + ...mapGetters([ + 'isNotesFetched', + 'discussions', + 'getNotesDataByProp', + 'discussionCount', + 'isLoading', + ]), noteableType() { return this.noteableData.noteableType; }, |