diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-15 06:10:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-15 06:10:30 +0300 |
| commit | c9bdf919932b7285ef9920bdac955459340da8fe (patch) | |
| tree | c133d05b5cb003de0c6bb2234afb884f6882ccd9 /app/assets/javascripts/snippets | |
| parent | 8b75948934667904196aba319aedda25b00f06ff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/snippets')
| -rw-r--r-- | app/assets/javascripts/snippets/components/snippet_header.vue | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue index e65e55f6595..5ba62908b43 100644 --- a/app/assets/javascripts/snippets/components/snippet_header.vue +++ b/app/assets/javascripts/snippets/components/snippet_header.vue @@ -200,6 +200,13 @@ export default { <gl-avatar :size="24" :src="snippet.author.avatarUrl" /> <span class="bold">{{ snippet.author.name }}</span> </a> + <gl-emoji + v-if="snippet.author.status" + v-gl-tooltip + class="gl-vertical-align-baseline font-size-inherit gl-mr-1" + :title="snippet.author.status.message" + :data-name="snippet.author.status.emoji" + /> </template> </gl-sprintf> </div> |