Merge branch 'blame_encoding_error_fix' into 'master'

Fix for a "500: Encoding error" in the blame view What does this MR do? - The change enforces UTF-8 encoding on the source line data obtained from the Git. Are there points in the code the reviewer needs to double check? - The fix might not be enough to fix all encoding error issues in the blame view. There might be similar encoding issues if there are non-UTF-8 encoded names, for example Why was this MR needed? - This change fixes the "500: encoding error" that I get when I try to view the Gitlab source CHANGELOG file. What are the relevant issue numbers / Feature requests? - Gitlab issue #894: https://gitlab.com/gitlab-org/gitlab-ce/issues/894 See merge request !298

Merge branch 'blame_encoding_error_fix' into 'master'
347ce399 · Dmitriy Zaporozhets · a8b4756f · 09152bad · 347ce399
Commit 347ce399 authored Feb 04, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

show.html.haml app/views/projects/blame/show.html.haml +1 -1

No files found.
--- 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 %>