diff options
author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-02-21 06:03:12 +0300 |
---|---|---|
committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 14:56:55 +0300 |
commit | 78a4189ece4f8d125eefbfdf6619d3452820bb8e (patch) | |
tree | 45f950c72b9a9c452610bbcd75d2d8d23f67898f /app/assets/javascripts/jobs/components/sidebar_details_block.vue | |
parent | d633bc8134fe472137fb668c1eb78de45dc9bb57 (diff) |
Show timeout information on job's page
Diffstat (limited to 'app/assets/javascripts/jobs/components/sidebar_details_block.vue')
-rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 56814a52525..94c2084623b 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -39,6 +39,15 @@ runnerId() { return `#${this.job.runner.id}`; }, + timeout() { + let t = `${this.job.timeout.value}`; + + if (this.job.timeout.source != null) { + t += ` (from ${this.job.timeout.source})`; + } + + return t; + }, renderBlock() { return this.job.merge_request || this.job.duration || @@ -115,6 +124,12 @@ :value="queued" /> <detail-row + class="js-job-timeout" + v-if="job.timeout" + title="Timeout" + :value="timeout" + /> + <detail-row class="js-job-runner" v-if="job.runner" title="Runner" |