diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-09 03:10:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-09 03:10:07 +0300 |
commit | c72613147447f060da53873ba698133198cf416c (patch) | |
tree | c4ee34f7dca96bb48033c94910d3865b065c2439 /app/assets/javascripts/notes | |
parent | f26a600a69b3a13d3102d801f5d92d3235ea56d4 (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 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index 655c9bcad6c..46669a752b2 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -10,6 +10,7 @@ import { mapActions } from 'vuex'; import { __, s__ } from '~/locale'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import UserNameWithStatus from '~/sidebar/components/assignees/user_name_with_status.vue'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { safeHtmlConfig: { ADD_TAGS: ['gl-emoji'] }, @@ -26,6 +27,7 @@ export default { SafeHtml, GlTooltip: GlTooltipDirective, }, + mixins: [glFeatureFlagsMixin()], props: { author: { type: Object, @@ -183,21 +185,28 @@ export default { :data-user-id="author.id" :data-username="author.username" > + <span + v-if="glFeatures.removeUserAttributes" + class="note-header-author-name gl-font-weight-bold" + > + {{ authorName }} + </span> <user-name-with-status + v-if="!glFeatures.removeUserAttributes" :name="authorName" :availability="userAvailability(author)" container-classes="note-header-author-name gl-font-weight-bold" /> </a> <span - v-if="authorStatus" + v-if="authorStatus && !glFeatures.removeUserAttributes" ref="authorStatus" v-safe-html:[$options.safeHtmlConfig]="authorStatus" v-on=" authorStatusHasTooltip ? { mouseenter: removeEmojiTitle, mouseleave: addEmojiTitle } : {} " ></span> - <span class="text-nowrap author-username"> + <span v-if="!glFeatures.removeUserAttributes" class="text-nowrap author-username"> <a ref="authorUsernameLink" class="author-username-link" |