diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-12 17:16:47 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-15 13:28:19 +0200 |
| commit | defdf59a42e03cd307e30f0423c2112db5877eac (patch) | |
| tree | 2c7ee4bd1a9c264afcea81f6b0c817973a1f0d54 /app | |
| parent | bec3c07d8fbdcff322b4900a4b98f9794700fbb7 (diff) | |
| download | gitlab-ce-defdf59a42e03cd307e30f0423c2112db5877eac.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')
| -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); |