diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index 37bde089de8..dbd8efec948 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -12,11 +12,6 @@ import UserAvatarImage from '../user_avatar/user_avatar_image.vue'; const MAX_SKELETON_LINES = 4; -const SECURITY_BOT_USER_DATA = { - username: 'GitLab-Security-Bot', - name: 'GitLab Security Bot', -}; - export default { name: 'UserPopover', maxSkeletonLines: MAX_SKELETON_LINES, @@ -56,15 +51,6 @@ export default { userIsLoading() { return !this.user?.loaded; }, - isSecurityBot() { - const { username, name, websiteUrl = '' } = this.user; - return ( - gon.features?.securityAutoFix && - username === SECURITY_BOT_USER_DATA.username && - name === SECURITY_BOT_USER_DATA.name && - websiteUrl.length - ); - }, availabilityStatus() { return this.user?.status?.availability || ''; }, @@ -114,7 +100,7 @@ export default { <div v-if="statusHtml" class="js-user-status gl-mt-3"> <span v-html="statusHtml"></span> </div> - <div v-if="isSecurityBot" class="gl-text-blue-500"> + <div v-if="user.bot" class="gl-text-blue-500"> <gl-icon name="question" /> <gl-link data-testid="user-popover-bot-docs-link" :href="user.websiteUrl"> {{ sprintf(__('Learn more about %{username}'), { username: user.name }) }} |