Commit 09152bad authored by Timo Lilja's avatar Timo Lilja

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
parent ada6c608
...@@ -30,5 +30,5 @@ ...@@ -30,5 +30,5 @@
%code %code
:erb :erb
<% lines.each do |line| %> <% lines.each do |line| %>
<%= highlight(@blob.name, line, true).html_safe %> <%= highlight(@blob.name, line.force_encoding("utf-8"), true).html_safe %>
<% end %> <% end %>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment