diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 09:37:54 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 09:37:54 +0100 |
| commit | 26342bf01ca881a806cd1b66a9948fb384dbe589 (patch) | |
| tree | af3dc73a453ee1bc5933aa53ecba9dd33ed7fb07 /app/assets/javascripts/ide/components/jobs | |
| parent | b97e7cd333e662682c0cce9a69fd35390827ae88 (diff) | |
| parent | 4666ef683c75b5c053e579010926e03cdffa497f (diff) | |
| download | gitlab-ce-26342bf01ca881a806cd1b66a9948fb384dbe589.tar.gz | |
Merge branch 'master' into fl-eslint-vue-house-keeping
* master:
Restoring user v3 endpoint
Resolve "Use one column form layout on Admin Area Settings page"
Resolve "Participants tooltip is cutoff when too close to the window edge"
Fix group member filter layout
Align nav bar items
Fix labels too large
Added with_statsoption for GET /projects/:id/repository/commits
Fixed IDE jobs empty state showing when loading
Fixes Microsoft Teams notifications for pipeline events
Migrate compare_source_branch to use only Gitaly
Clean up stale Prometheus metrics in before_exec unicorn hook
Remove top padding from .col-form-label
Diffstat (limited to 'app/assets/javascripts/ide/components/jobs')
| -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 c7098c88934..f39ce545656 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" > |