diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/jobs/components/erased_block.vue | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/jobs/components/erased_block.vue')
-rw-r--r-- | app/assets/javascripts/jobs/components/erased_block.vue | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/app/assets/javascripts/jobs/components/erased_block.vue b/app/assets/javascripts/jobs/components/erased_block.vue index a6d1b41c275..a815689659e 100644 --- a/app/assets/javascripts/jobs/components/erased_block.vue +++ b/app/assets/javascripts/jobs/components/erased_block.vue @@ -1,12 +1,14 @@ <script> +import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui'; import { isEmpty } from 'lodash'; -import { GlLink } from '@gitlab/ui'; import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; export default { components: { - TimeagoTooltip, + GlAlert, GlLink, + GlSprintf, + TimeagoTooltip, }, props: { user: { @@ -27,17 +29,21 @@ export default { }; </script> <template> - <div class="gl-mt-3 js-build-erased"> - <div class="erased alert alert-warning"> + <div class="gl-mt-3"> + <gl-alert variant="warning" :dismissible="false"> <template v-if="isErasedByUser"> - {{ s__('Job|Job has been erased by') }} - <gl-link :href="user.web_url"> {{ user.username }} </gl-link> + <gl-sprintf :message="s__('Job|Job has been erased by %{userLink}')"> + <template #userLink> + <gl-link :href="user.web_url" target="_blank">{{ user.username }}</gl-link> + </template> + </gl-sprintf> </template> + <template v-else> {{ s__('Job|Job has been erased') }} </template> <timeago-tooltip :time="erasedAt" /> - </div> + </gl-alert> </div> </template> |