diff options
| author | André Luís <me@andr3.net> | 2018-10-06 17:16:40 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-06 17:16:40 +0000 |
| commit | 8e5c0e68ec837fe247df271a58a819238b8c20b1 (patch) | |
| tree | cce05bb0548404b2bbeb0ecd7ad27c6659f45040 /app/assets/javascripts/notes/components/note_body.vue | |
| parent | 54c442af23169cc146bb6bb2484ca2d3d98ef870 (diff) | |
| download | gitlab-ce-8e5c0e68ec837fe247df271a58a819238b8c20b1.tar.gz | |
Backport CE changes for: [Frontend only] Batch comments on merge requests
Diffstat (limited to 'app/assets/javascripts/notes/components/note_body.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_body.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index 6f4a0709825..cf4c35de42c 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -109,7 +109,7 @@ export default { class="note_edited_ago" /> <note-awards-list - v-if="note.award_emoji.length" + v-if="note.award_emoji && note.award_emoji.length" :note-id="note.id" :note-author-id="note.author.id" :awards="note.award_emoji" |