diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-09 15:50:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-09 15:50:05 +0000 |
| commit | 6c62482144e786f83ed62298e06604e46e93107e (patch) | |
| tree | 68e605024be118c8426a2a83df0d1dc3dfbe0e07 /lib/ci | |
| parent | 583deef209af5a2700701fb0933582a7b5680620 (diff) | |
| parent | 76eec7ba54aa7077005aa55bfc8581c2a48b8083 (diff) | |
| download | gitlab-ce-6c62482144e786f83ed62298e06604e46e93107e.tar.gz | |
Merge branch '19086-double-newline' into 'master'
Fix Double Spaced CI Log
Closes #19086
See merge request !8349
Diffstat (limited to 'lib/ci')
| -rw-r--r-- | lib/ci/ansi2html.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb index 229050151d3..c10d3616f31 100644 --- a/lib/ci/ansi2html.rb +++ b/lib/ci/ansi2html.rb @@ -105,7 +105,7 @@ module Ci break elsif s.scan(/</) @out << '<' - elsif s.scan(/\n/) + elsif s.scan(/\r?\n/) @out << '<br>' else @out << s.scan(/./m) |