diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-25 00:08:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-25 00:08:34 +0000 |
| commit | 1e6730a4e32f6cbf4b84aa9fc13204778783f33c (patch) | |
| tree | 6dd6c9ed98ec836432cf431397a4ef45dd78deb8 /app/assets/javascripts/notes/components/noteable_note.vue | |
| parent | 95a48f11db963bc55ab918e3eb24f8576dca4a81 (diff) | |
| download | gitlab-ce-1e6730a4e32f6cbf4b84aa9fc13204778783f33c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_note.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 83942499f4e..c91ae1ed14e 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -392,7 +392,9 @@ export default { :img-alt="author.name" :img-size="40" > - <slot slot="avatar-badge" name="avatar-badge"></slot> + <template #avatar-badge> + <slot name="avatar-badge"></slot> + </template> </user-avatar-link> </div> <div class="timeline-content"> @@ -403,7 +405,9 @@ export default { :note-id="note.id" :is-confidential="note.confidential" > - <slot slot="note-header-info" name="note-header-info"></slot> + <template #note-header-info> + <slot name="note-header-info"></slot> + </template> <span v-if="commit" v-safe-html="actionText"></span> <span v-else-if="note.created_at" class="d-none d-sm-inline">·</span> </note-header> |