diff --git a/app/assets/javascripts/jobs/components/log/duration_badge.vue b/app/assets/javascripts/jobs/components/log/duration_badge.vue
index e9bc9e2cc9b4d5132d70034c8b5bd02449b302a0..83f62703d27be228140e2f9940b9d234ad58eb18 100644
--- a/app/assets/javascripts/jobs/components/log/duration_badge.vue
+++ b/app/assets/javascripts/jobs/components/log/duration_badge.vue
@@ -9,5 +9,5 @@ export default {
};
- {{ duration }}
+ {{ duration }}
diff --git a/app/assets/javascripts/jobs/components/log/log.vue b/app/assets/javascripts/jobs/components/log/log.vue
index 92a72c932c3d2299f554d9c4b9ece2a659d3cfad..429796aeb4e5188cdf11cd32f9b536a1a56b4675 100644
--- a/app/assets/javascripts/jobs/components/log/log.vue
+++ b/app/assets/javascripts/jobs/components/log/log.vue
@@ -20,7 +20,7 @@ export default {
};
-
+
({
export const logLinesParser = (lines = [], lineNumberStart) =>
lines.reduce((acc, line, index) => {
const lineNumber = lineNumberStart ? lineNumberStart + index : index;
+ const last = acc[acc.length - 1];
+
if (line.section_header) {
acc.push({
isClosed: true,
@@ -32,15 +34,10 @@ export const logLinesParser = (lines = [], lineNumberStart) =>
line: parseLine(line, lineNumber),
lines: [],
});
- } else if (
- acc.length &&
- acc[acc.length - 1].isHeader &&
- !line.section_duration &&
- line.content.length
- ) {
- acc[acc.length - 1].lines.push(parseLine(line, lineNumber));
- } else if (acc.length && acc[acc.length - 1].isHeader && line.section_duration) {
- acc[acc.length - 1].section_duration = line.section_duration;
+ } else if (acc.length && last.isHeader && !line.section_duration && line.content.length) {
+ last.lines.push(parseLine(line, lineNumber));
+ } else if (acc.length && last.isHeader && line.section_duration) {
+ last.section_duration = line.section_duration;
} else if (line.content.length) {
acc.push(parseLine(line, lineNumber));
}
diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss
index fcf185df4a86ec514c716ae881a29896acd0f378..5c2491c82332c884100cd04f3c2eb4941f4bacd4 100644
--- a/app/assets/stylesheets/framework/job_log.scss
+++ b/app/assets/stylesheets/framework/job_log.scss
@@ -1,6 +1,5 @@
.job-log {
font-family: $monospace-font;
- display: block;
padding: $gl-padding-8 $input-horizontal-padding;
margin: 0 0 $gl-padding-8;
font-size: 13px;