diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-01 03:12:32 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:57:40 +0200 |
| commit | 1dde609ca6b130aa0a3d39e929edee7e770e62fc (patch) | |
| tree | 5cd6b85eaf9c49e7c14aa23c5c2aa5814f1d955b /app/assets/javascripts/jobs | |
| parent | d34e937b93b103435a59e6759a9f30e9f8addc11 (diff) | |
| download | gitlab-ce-1dde609ca6b130aa0a3d39e929edee7e770e62fc.tar.gz | |
Move job timeout information to new ci_builds_metadata table
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index ad859679a1e..15584922d1f 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -45,10 +45,10 @@ return `#${this.job.runner.id}`; }, timeout() { - let t = `${this.job.timeout.value}`; + let t = `${this.job.metadata.used_timeout_human_readable}`; - if (this.job.timeout.source != null) { - t += ` (from ${this.job.timeout.source})`; + if (this.job.metadata.timeout_source != null) { + t += ` (from ${this.job.metadata.timeout_source})`; } return t; @@ -130,7 +130,7 @@ /> <detail-row class="js-job-timeout" - v-if="job.timeout" + v-if="job.metadata.used_timeout_human_readable" title="Timeout" :help-url="runnerHelpUrl" :value="timeout" |