Commit 34cc38b6f5942523820ce239b1d5877b0a97e25e
1 parent
202807c2
Exists in
master
and in
4 other branches
diff now no need to force_encoding to utf8
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/helpers/commits_helper.rb
| @@ -58,14 +58,14 @@ module CommitsHelper | @@ -58,14 +58,14 @@ module CommitsHelper | ||
| 58 | next if line.match(/^\-\-\- a/) | 58 | next if line.match(/^\-\-\- a/) |
| 59 | next if line.match(/^\+\+\+ b/) | 59 | next if line.match(/^\+\+\+ b/) |
| 60 | 60 | ||
| 61 | - full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8") | 61 | + full_line = html_escape(line.gsub(/\n/, '')) |
| 62 | 62 | ||
| 63 | if line.match(/^@@ -/) | 63 | if line.match(/^@@ -/) |
| 64 | type = "match" | 64 | type = "match" |
| 65 | 65 | ||
| 66 | line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 | 66 | line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 |
| 67 | line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0 | 67 | line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0 |
| 68 | - | 68 | + |
| 69 | next if line_old == 1 && line_new == 1 | 69 | next if line_old == 1 && line_new == 1 |
| 70 | yield(full_line, type, nil, nil, nil) | 70 | yield(full_line, type, nil, nil, nil) |
| 71 | next | 71 | next |