summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-06-05 17:21:33 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-06-05 17:21:33 +0100
commit7519a25a6161b2ca540ca9fc4e42e4b03aed4eeb (patch)
treeebabc750dc5413f461e8470434d31b191eeef3ef /app
parent17e30a3212df7ed2f6d57d64371ce594a66439ca (diff)
downloadgitlab-ce-7519a25a6161b2ca540ca9fc4e42e4b03aed4eeb.tar.gz
Use `started` key to show the triggered date
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/jobs/components/header.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/header.vue b/app/assets/javascripts/jobs/components/header.vue
index c1044f4cd42..5704d753277 100644
--- a/app/assets/javascripts/jobs/components/header.vue
+++ b/app/assets/javascripts/jobs/components/header.vue
@@ -42,6 +42,9 @@ export default {
jobStarted() {
return !this.job.started === false;
},
+ headerTime() {
+ return this.jobStarted ? this.job.started : this.job.created_at;
+ },
},
watch: {
job() {
@@ -73,7 +76,7 @@ export default {
:status="status"
item-name="Job"
:item-id="job.id"
- :time="job.created_at"
+ :time="headerTime"
:user="job.user"
:actions="actions"
:has-sidebar-button="true"