Commit 4281704fb3d93fd641643e0eab1e388254c71f96
1 parent
139c4c2f
Exists in
master
and in
4 other branches
fix diff bug with utf-8
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/views/commits/_text_file.html.haml
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | - line_new = 0 | 2 | - line_new = 0 |
| 3 | - lines_arr = diff.diff.lines.to_a | 3 | - lines_arr = diff.diff.lines.to_a |
| 4 | - lines_arr.each do |line| | 4 | - lines_arr.each do |line| |
| 5 | - - line = line.force_encoding(Encoding::UTF_8) | 5 | + - line.force_encoding(Encoding::UTF_8) |
| 6 | - next if line.match(/^--- \/dev\/null/) | 6 | - next if line.match(/^--- \/dev\/null/) |
| 7 | - next if line.match(/^--- a/) | 7 | - next if line.match(/^--- a/) |
| 8 | - next if line.match(/^\+\+\+ b/) | 8 | - next if line.match(/^\+\+\+ b/) |