diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-07 10:04:54 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-07 10:04:54 +0000 |
| commit | e1e315ee28c07a0095996375767076ff9259cbd5 (patch) | |
| tree | 19d1d462b7159b9bce861e96c801623fcb4d39be /app/assets/javascripts/notes/components/noteable_discussion.vue | |
| parent | 54ba4fdbf09653d2804e08200b3a5bd06f402f58 (diff) | |
| parent | 0485c04764638b4ec198097ac3efd69d6b6d3aad (diff) | |
| download | gitlab-ce-e1e315ee28c07a0095996375767076ff9259cbd5.tar.gz | |
Merge branch 'mr-image-commenting' into 'master'
Re-implemented image commenting on diffs
Closes #48956
See merge request gitlab-org/gitlab-ce!22443
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_discussion.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 6293dd5b7e1..07115ca07c4 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -350,11 +350,18 @@ Please check your network connection and try again.`; <ul class="notes"> <component :is="componentName(note)" - v-for="note in discussion.notes" + v-for="(note, index) in discussion.notes" :key="note.id" :note="componentData(note)" @handleDeleteNote="deleteNoteHandler" - /> + > + <slot + v-if="index === 0" + slot="avatar-badge" + name="avatar-badge" + > + </slot> + </component> </ul> <div :class="{ 'is-replying': isReplying }" |