diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml index 29eae1c43c77e0f38fe955c20eda32512d93c6ca..292dcdef0a539a938785ecb249bcf2bc7f63d619 100644 --- a/app/views/commits/_diffs.html.haml +++ b/app/views/commits/_diffs.html.haml @@ -15,9 +15,9 @@ %strong{:id => "#{diff.b_path}"}= diff.b_path %br/ .diff_file_content - - if file.text? + - if defined? file.text and file.text? = render "commits/text_file", :diff => diff, :index => i - - elsif file.image? + - elsif defined? file.image and file.image? .diff_file_content_image %img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} - else diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml index 441bdf2c210ef2d4c6106623568850b1b942bba8..43947f987c4288c9976f8bbc8be5b7b4245bebf0 100644 --- a/app/views/commits/_text_file.html.haml +++ b/app/views/commits/_text_file.html.haml @@ -4,14 +4,14 @@ - if type == "match" %td.old_line= "..." %td.new_line= "..." - %td.line_content.matched= line + %td.line_content.matched= line.force_encoding('UTF-8') - else %td.old_line = link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code - if @comments_allowed = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line" %td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code - %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  " + %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line.force_encoding('UTF-8')}  " - if @comments_allowed - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse