diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 15:07:29 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 15:07:29 +0000 |
| commit | 10a190dba2db339093cdc4949ef54cc287196b9b (patch) | |
| tree | 5dfe7779d4093c0a38af2404095e1400e5339283 /app | |
| parent | 893c824ed3f99d5c1f79f09acb12eac5ce5e159f (diff) | |
| parent | 1801b7fd20b6732a8381878147943f32f564dc18 (diff) | |
| download | gitlab-ce-10a190dba2db339093cdc4949ef54cc287196b9b.tar.gz | |
Merge branch 'ide-job-loading-empty-state' into 'master'
Fixed IDE jobs empty state showing when loading
Closes #47766
See merge request gitlab-org/gitlab-ce!19706
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/jobs/detail.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/components/jobs/detail.vue b/app/assets/javascripts/ide/components/jobs/detail.vue index 4d234a36fe5..6713b54efae 100644 --- a/app/assets/javascripts/ide/components/jobs/detail.vue +++ b/app/assets/javascripts/ide/components/jobs/detail.vue @@ -122,6 +122,7 @@ export default { @scroll="scrollBuildLog" > <code + v-show="!detailJob.isLoading" class="bash" v-html="jobOutput" > |