Show timeout information on job's page

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"