summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-05-04 19:30:13 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-05-05 15:41:37 +0100
commit9f3f22c8959b430811102fb790895e7edd61d3f9 (patch)
treeb1eabbab0a3d1298b6095ad9d2dde67a8d248ee4
parentacd9cd0906046f3d11d95aa9dc9d1af0498ef2ef (diff)
downloadgitlab-ce-24883-build-failure-summary-page.tar.gz
Failed Jobs tab only shows 10 job traces for performance24883-build-failure-summary-page
-rw-r--r--app/helpers/builds_helper.rb8
-rw-r--r--app/views/projects/pipelines/_with_tabs.html.haml6
2 files changed, 9 insertions, 5 deletions
diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb
index 0145029fb60..2eb2c6c7389 100644
--- a/app/helpers/builds_helper.rb
+++ b/app/helpers/builds_helper.rb
@@ -1,7 +1,11 @@
module BuildsHelper
- def build_summary(build)
+ def build_summary(build, skip: false)
if build.has_trace?
- build.trace.html(last_lines: 10).html_safe
+ if skip
+ link_to "View job trace", pipeline_build_url(build.pipeline, build)
+ else
+ build.trace.html(last_lines: 10).html_safe
+ end
else
"No job trace"
end
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml
index ba2c71cfd88..1aa48bf9813 100644
--- a/app/views/projects/pipelines/_with_tabs.html.haml
+++ b/app/views/projects/pipelines/_with_tabs.html.haml
@@ -46,11 +46,11 @@
= render partial: "projects/stage/stage", collection: pipeline.stages, as: :stage
- if failed_builds.present?
#js-tab-failures.build-failures.tab-pane
- - failed_builds.each do |build|
+ - failed_builds.each_with_index do |build, index|
.build-state
%span.ci-status-icon-failed= custom_icon('icon_status_failed')
%span.stage
= build.stage.titleize
%span.build-name
- = render "notify/links/#{build.to_partial_path}", pipeline: @pipeline, build: build
- %pre.build-log= build_summary(build)
+ = link_to build.name, pipeline_build_url(pipeline, build)
+ %pre.build-log= build_summary(build, skip: index >= 10)