[6.6] Showing diff for files with utf8 + byte order marker causes error 500
Created by: dfyx
What the title says: I can view files without problems but as soon as I open a page that contains a diff for that file, I get the following error:
Started GET "/kunden-pc/hebrech-installer/commit/e097ce6f055bf824eb81a3df794b00a1eb01ab0e" for 127.0.0.1 at 2014-03-06 15:10:54 +0100
Processing by Projects::CommitController#show as HTML
Parameters: {"project_id"=>"kunden-pc/hebrech-installer", "id"=>"e097ce6f055bf824eb81a3df794b00a1eb01ab0e"}
Rendered projects/commit/_commit_box.html.haml (7.0ms)
Rendered projects/commits/_diff_head.html.haml (0.1ms)
Rendered projects/notes/_diff_note_link.html.haml (1.0ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/commits/_text_file.html.haml (3.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.6ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.6ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.6ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.6ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.6ms)
Rendered projects/notes/_diff_note_link.html.haml (0.5ms)
Rendered projects/notes/_diff_note_link.html.haml (0.6ms)
Rendered projects/commits/_text_file.html.haml (17.3ms)
Rendered projects/commits/_diffs.html.haml (34.6ms)
Rendered projects/commit/show.html.haml within layouts/projects (44.4ms)
Encoding::CompatibilityError (incompatible character encodings: UTF-8 and ASCII-8BIT):
app/views/projects/commits/_diffs.html.haml:73:in `block in _app_views_projects_commits__diffs_html_haml__383001347_122454460'
app/views/projects/commits/_diffs.html.haml:42:in `each'
app/views/projects/commits/_diffs.html.haml:42:in `each_with_index'
app/views/projects/commits/_diffs.html.haml:42:in `_app_views_projects_commits__diffs_html_haml__383001347_122454460'
app/views/projects/commit/show.html.haml:2:in `_app_views_projects_commit_show_html_haml__412084403_121050850'
app/controllers/application_controller.rb:57:in `set_current_user_for_thread'
Rendered errors/encoding.html.haml within layouts/errors (0.1ms)
Rendered layouts/_head.html.haml (0.9ms)
Rendered layouts/_search.html.haml (0.8ms)
Rendered layouts/_head_panel.html.haml (5.8ms)
Rendered layouts/_flash.html.haml (0.1ms)
Completed 500 Internal Server Error in 271ms (Views: 8.6ms | ActiveRecord: 5.0ms)