summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2018-04-12 07:54:48 +0000
committerJames Lopez <james@jameslopez.es>2018-04-12 10:11:05 +0200
commit8e26fbfeff7fbd32879bfc530fb3eb5bcbd73a00 (patch)
tree24586af26d80f56d06d8b432a22fa6bfa7cae8c0 /app
parent6e5d159550e5f36fea9b9530d7110c7dc97723f9 (diff)
downloadgitlab-ce-8e26fbfeff7fbd32879bfc530fb3eb5bcbd73a00.tar.gz
Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'
Fix empty state for build that does not have a trace Closes #45204 See merge request gitlab-org/gitlab-ce!18278
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/jobs/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index 8beb4ffef45..cbbcc8f1db5 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -55,7 +55,7 @@
- else
Job has been erased #{time_ago_with_tooltip(@build.erased_at)}
- - if @build.has_trace?
+ - if @build.running? || @build.has_trace?
.build-trace-container.prepend-top-default
.top-bar.js-top-bar
.js-truncated-info.truncated-info.hidden-xs.pull-left.hidden<