summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorJared Deckard <jared.deckard@gmail.com>2016-12-28 08:03:28 -0600
committerJared Deckard <jared.deckard@gmail.com>2016-12-28 16:32:45 -0600
commit9f3421730d499d4961a69c86ec48eca6cc214c7b (patch)
tree65329837a243d6a5280a0ed3fb1379d57f24becd /lib/ci
parent104b7b6c39df96d25d36749e4e7f6d5f44d46acf (diff)
downloadgitlab-ce-9f3421730d499d4961a69c86ec48eca6cc214c7b.tar.gz
Replace carriage return combos with line breaks tags
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/ansi2html.rb2
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 << '&lt;'
- elsif s.scan(/\n/)
+ elsif s.scan(/\r?\n/)
@out << '<br>'
else
@out << s.scan(/./m)