From c2cfc52e449a7bcd817909ace4ab8926509ee4f2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 1 Dec 2011 01:51:16 +0200 Subject: [PATCH] fix merge request diff --- app/views/merge_requests/_diffs.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/merge_requests/_diffs.html.haml b/app/views/merge_requests/_diffs.html.haml index eb44de68..2ea6c79d 100644 --- a/app/views/merge_requests/_diffs.html.haml +++ b/app/views/merge_requests/_diffs.html.haml @@ -1,4 +1,4 @@ -- @diffs.each do |diff| +- @diffs.each_with_index do |diff, i| - next if diff.diff.empty? - file = (@commit.tree / diff.b_path) - next unless file @@ -12,7 +12,7 @@ %br/ .diff_file_content - if file.text? - = render :partial => "commits/text_file", :locals => { :diff => diff } + = render :partial => "commits/text_file", :locals => { :diff => diff, :index => i } - elsif file.image? .diff_file_content_image %img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}