diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
| commit | 184c2ced0761bd8dd7032619d16d3983fed7944a (patch) | |
| tree | cc82b32ee7c1797509da3cf384617e4ffa2e1733 /app/assets/javascripts/jobs | |
| parent | 238d22c07218adf2b8f3db630ee8b74ca6f29df5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index b4b124d5db1..859f839741f 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -130,6 +130,10 @@ export default { return title; }, + + shouldRenderHeaderCallout() { + return this.shouldRenderCalloutMessage && !this.hasUnmetPrerequisitesFailure; + }, }, watch: { // Once the job log is loaded, @@ -239,10 +243,9 @@ export default { /> </div> - <callout - v-if="shouldRenderCalloutMessage && !hasUnmetPrerequisitesFailure" - :message="job.callout_message" - /> + <callout v-if="shouldRenderHeaderCallout"> + <div v-html="job.callout_message"></div> + </callout> </header> <!-- EO Header Section --> |