diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-06 16:25:13 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:58:16 +0200 |
| commit | d58d3098f159a17fbcf1ae27165c249722990988 (patch) | |
| tree | cb1a8732227282cbfe85ded3e1d7dcc5ab5308ce /app/assets/javascripts/jobs | |
| parent | f5e602ee0f8d95617adf6fb9b5a1a132a471fb12 (diff) | |
| download | gitlab-ce-d58d3098f159a17fbcf1ae27165c249722990988.tar.gz | |
Rename used_timeout to timeout
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 15584922d1f..6ff3fa6e099 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -45,7 +45,7 @@ return `#${this.job.runner.id}`; }, timeout() { - let t = `${this.job.metadata.used_timeout_human_readable}`; + let t = `${this.job.metadata.timeout_human_readable}`; if (this.job.metadata.timeout_source != null) { t += ` (from ${this.job.metadata.timeout_source})`; @@ -130,7 +130,7 @@ /> <detail-row class="js-job-timeout" - v-if="job.metadata.used_timeout_human_readable" + v-if="job.metadata.timeout_human_readable" title="Timeout" :help-url="runnerHelpUrl" :value="timeout" |