diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 11:51:20 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 11:51:20 +0000 |
| commit | 318b22459bfff1cecfb1f38e381faaca3bc29bbb (patch) | |
| tree | ce86dd867f05e5cf4f6fd30f4bb19adf4681134b /lib | |
| parent | 019a3c781efd75a8ce44297519a724e322cfde96 (diff) | |
| parent | 24ef7063bee25c76ecfc8c14c494161208b01352 (diff) | |
| download | gitlab-ce-318b22459bfff1cecfb1f38e381faaca3bc29bbb.tar.gz | |
Merge branch 'incremental-fixes' into 'master'
Fix concurrent request when updating build log in browser
If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one.
Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535
See merge request !4183
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ci/ansi2html.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb index c628257e3f4..229050151d3 100644 --- a/lib/ci/ansi2html.rb +++ b/lib/ci/ansi2html.rb @@ -90,7 +90,7 @@ module Ci def convert(raw, new_state) reset_state - restore_state(raw, new_state) if new_state + restore_state(raw, new_state) if new_state.present? start = @offset ansi = raw[@offset..-1] @@ -105,6 +105,8 @@ module Ci break elsif s.scan(/</) @out << '<' + elsif s.scan(/\n/) + @out << '<br>' else @out << s.scan(/./m) end |