diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 15:06:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-01 15:06:05 +0000 |
commit | 05f4b2fb34dbb051b2ce5ddbc801ec42998c019c (patch) | |
tree | 0fd7a153f3ed7d00d40e428c08ab81ae3d863afe /app/assets/javascripts/jobs/store/mutations.js | |
parent | 9e27f0d920cc3891fa7644c5cc0bc280c519fb20 (diff) | |
download | gitlab-ce-05f4b2fb34dbb051b2ce5ddbc801ec42998c019c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs/store/mutations.js')
-rw-r--r-- | app/assets/javascripts/jobs/store/mutations.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/store/mutations.js b/app/assets/javascripts/jobs/store/mutations.js index 540c3e2ad69..412ae146ca0 100644 --- a/app/assets/javascripts/jobs/store/mutations.js +++ b/app/assets/javascripts/jobs/store/mutations.js @@ -26,8 +26,7 @@ export default { if (log.append) { if (isNewJobLogActive()) { - state.originalTrace = state.originalTrace.concat(log.trace); - state.trace = updateIncrementalTrace(state.originalTrace, state.trace, log.lines); + state.trace = updateIncrementalTrace(log.lines, state.trace); } else { state.trace += log.html; } @@ -38,7 +37,6 @@ export default { // html or size. We keep the old value otherwise these // will be set to `undefined` if (isNewJobLogActive()) { - state.originalTrace = log.lines || state.trace; state.trace = logLinesParser(log.lines) || state.trace; } else { state.trace = log.html || state.trace; |