diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-12 17:16:47 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-12 17:16:47 +0000 |
commit | 1103f589f0a77bf11ca3103165fb287a6d092eb5 (patch) | |
tree | 5c1d0211192a7e9524d3684f0cdd5f1aa5654279 /app/assets/javascripts | |
parent | 7e342757e283a6fe552688351580ec6d6700e58f (diff) | |
parent | 85c30d742cec72466389a77a2df8d42e3c0075d7 (diff) | |
download | gitlab-ce-1103f589f0a77bf11ca3103165fb287a6d092eb5.tar.gz |
Merge branch '52614-update-job-started-check' into 'master'
Updates the check for started in job header
See merge request gitlab-org/gitlab-ce!22329
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/store/getters.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index acf91e2e9ed..4e8d3ad24cc 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -30,7 +30,7 @@ 'headerActions', 'headerTime', 'shouldRenderCalloutMessage', - 'jobHasStarted', + 'shouldRenderTriggeredLabel', 'hasEnvironment', 'isJobStuck', 'hasTrace', @@ -58,7 +58,7 @@ :user="job.user" :actions="headerActions" :has-sidebar-button="true" - :should-render-triggered-label="jobHasStarted" + :should-render-triggered-label="shouldRenderTriggeredLabel" :item-name="__('Job')" /> </div> diff --git a/app/assets/javascripts/jobs/store/getters.js b/app/assets/javascripts/jobs/store/getters.js index afe5f88b292..9f4f372e3d2 100644 --- a/app/assets/javascripts/jobs/store/getters.js +++ b/app/assets/javascripts/jobs/store/getters.js @@ -22,10 +22,10 @@ export const shouldRenderCalloutMessage = state => !_.isEmpty(state.job.status) && !_.isEmpty(state.job.callout_message); /** - * When job has not started the key will be `false` + * When job has not started the key will be null * When job started the key will be a string with a date. */ -export const jobHasStarted = state => !(state.job.started === false); +export const shouldRenderTriggeredLabel = state => _.isString(state.job.started); export const hasEnvironment = state => !_.isEmpty(state.job.deployment_status); |