diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-31 20:51:12 -0700 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-01 13:24:06 +0200 |
| commit | 3fe18525ddca414017d330e992999bad05002fa8 (patch) | |
| tree | 04836fccf41e3228324f162dbb399c9e3c0360be /lib/rouge | |
| parent | e91fe7553db6f1e9d286df4941a1847f27a767d5 (diff) | |
| download | gitlab-ce-3fe18525ddca414017d330e992999bad05002fa8.tar.gz | |
Trim extra displayed carriage returns in diffs and files with CRLFs
Closes #20440
Diffstat (limited to 'lib/rouge')
| -rw-r--r-- | lib/rouge/formatters/html_gitlab.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rouge/formatters/html_gitlab.rb b/lib/rouge/formatters/html_gitlab.rb index f818dc78d34..4edfd015074 100644 --- a/lib/rouge/formatters/html_gitlab.rb +++ b/lib/rouge/formatters/html_gitlab.rb @@ -18,7 +18,7 @@ module Rouge is_first = false yield %(<span id="LC#{@line_number}" class="line">) - line.each { |token, value| yield span(token, value) } + line.each { |token, value| yield span(token, value.chomp) } yield %(</span>) @line_number += 1 |