diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-25 18:12:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-25 18:12:14 +0300 |
| commit | 5f85444a43df1c5f025b520fdbc682cbf95d3ca0 (patch) | |
| tree | a224ff70de072fe19ff19c0bfec2c5cafe966cc5 /app/assets/javascripts/notes | |
| parent | 73507eaf1a77c5c05ae17c9f7ac29bbeb8bf5be1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index c2111d1f79d..655c9bcad6c 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -183,7 +183,6 @@ export default { :data-user-id="author.id" :data-username="author.username" > - <slot name="note-header-info"></slot> <user-name-with-status :name="authorName" :availability="userAvailability(author)" @@ -207,6 +206,7 @@ export default { @mouseleave="handleUsernameMouseLeave" ><span class="note-headline-light">@{{ author.username }}</span> </a> + <slot name="note-header-info"></slot> <gitlab-team-member-badge v-if="author && author.is_gitlab_employee" /> </span> </template> diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index ed7ef72086a..83bf66a324d 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -440,7 +440,7 @@ export default { </gl-avatar-link> </div> - <div v-else class="gl-float-left gl-pl-3 gl-mr-3 gl-md-pl-2 gl-md-pr-2"> + <div v-else class="gl-float-left gl-pl-3 gl-md-pl-2"> <gl-avatar-link :href="author.path"> <gl-avatar :src="author.avatar_url" |