diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 15:08:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-01 15:08:08 +0300 |
commit | 2828f81d2a41f46b89e13dc057b982f27aeee547 (patch) | |
tree | 742120cc334d018efe38a3974fd59a67869acc6d /app/assets/javascripts/jobs | |
parent | 4def415fbf45e0693b17ea418d378d62ab03a146 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_job_details_container.vue | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue b/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue index 2ba531c9e95..15c4e503685 100644 --- a/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue +++ b/app/assets/javascripts/jobs/components/sidebar_job_details_container.vue @@ -42,14 +42,11 @@ export default { this.job.duration || this.job.finished_at || this.job.erased_at || - this.job.queued || + this.job.queued_duration || this.job.runner || this.job.coverage, ); }, - queued() { - return timeIntervalInWords(this.job.queued); - }, runnerHelpUrl() { return helpPagePath('ci/runners/configure_runners.html', { anchor: 'set-maximum-job-timeout-for-a-runner', @@ -60,6 +57,9 @@ export default { return `#${id} (${token}) ${description}`; }, + queuedDuration() { + return timeIntervalInWords(this.job.queued_duration); + }, shouldRenderBlock() { return Boolean(this.hasAnyDetail || this.hasTimeout || this.hasTags); }, @@ -98,7 +98,7 @@ export default { :title="$options.i18n.FINISHED" /> <detail-row v-if="job.erased_at" :value="erasedAt" :title="$options.i18n.ERASED" /> - <detail-row v-if="job.queued" :value="queued" :title="$options.i18n.QUEUED" /> + <detail-row v-if="job.queued_duration" :value="queuedDuration" :title="$options.i18n.QUEUED" /> <detail-row v-if="hasTimeout" :help-url="runnerHelpUrl" |