diff options
| author | Timo Lilja <timo.lilja@ssh.com> | 2015-01-17 16:15:20 +0200 |
|---|---|---|
| committer | Timo Lilja <timo.lilja@ssh.com> | 2015-01-17 16:15:20 +0200 |
| commit | 09152bad0c3dd950d3d6dd0c0ea7f31056df1fdf (patch) | |
| tree | f7e32ebd59a5b5b713915561886c0e113cd81396 | |
| parent | ada6c6080b2fa0d63003f8b29b5c32195254906d (diff) | |
| download | gitlab-ce-09152bad0c3dd950d3d6dd0c0ea7f31056df1fdf.tar.gz | |
Fix "500: Encoding error" on blame view
This change forces encoding of source line data into UTF-8 and thus
fixes the encoding error at least partially. The issue is described in
https://gitlab.com/gitlab-org/gitlab-ce/issues/894
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index c507ecf2e49..51a2f20d1e2 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -30,5 +30,5 @@ %code :erb <% lines.each do |line| %> - <%= highlight(@blob.name, line, true).html_safe %> + <%= highlight(@blob.name, line.force_encoding("utf-8"), true).html_safe %> <% end %> |