summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-08-14 07:45:44 +0000
committerPhil Hughes <me@iamphill.com>2018-08-14 07:45:44 +0000
commitd94fb81497f770b6ebb2e1b7fe1c5413eba5d481 (patch)
tree1beeda1610ddd285249c183141e9d94acf6fd440 /app
parentc118ee864032646fa648c9e15d272d03f87d1aaa (diff)
parentc82d61d9bfabbc3829fec6640b6ba4485de73f36 (diff)
downloadgitlab-ce-d94fb81497f770b6ebb2e1b7fe1c5413eba5d481.tar.gz
Merge branch '50101-erased-block' into 'master'
Creates a Vue component for the erased block on the job view page See merge request gitlab-org/gitlab-ce!21158
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/jobs/components/erased_block.vue48
1 files changed, 48 insertions, 0 deletions
diff --git a/app/assets/javascripts/jobs/components/erased_block.vue b/app/assets/javascripts/jobs/components/erased_block.vue
new file mode 100644
index 00000000000..d688eebfa95
--- /dev/null
+++ b/app/assets/javascripts/jobs/components/erased_block.vue
@@ -0,0 +1,48 @@
+<script>
+import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+
+export default {
+ components: {
+ TimeagoTooltip,
+ },
+ props: {
+ erasedByUser: {
+ type: Boolean,
+ required: true,
+ },
+ username: {
+ type: String,
+ required: false,
+ default: null,
+ },
+ linkToUser: {
+ type: String,
+ required: false,
+ default: null,
+ },
+ erasedAt: {
+ type: String,
+ required: true,
+ },
+ },
+};
+</script>
+<template>
+ <div class="prepend-top-default js-build-erased">
+ <div class="erased alert alert-warning">
+ <template v-if="erasedByUser">
+ {{ s__("Job|Job has been erased by") }}
+ <a :href="linkToUser">
+ {{ username }}
+ </a>
+ </template>
+ <template v-else>
+ {{ s__("Job|Job has been erased") }}
+ </template>
+
+ <timeago-tooltip
+ :time="erasedAt"
+ />
+ </div>
+ </div>
+</template>