diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-15 02:41:36 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-02-15 02:41:51 +0400 |
| commit | ef396d08fc9af54f0e2c69da27d64e13064e0dfb (patch) | |
| tree | 187d8ed0c09b5a5d402c4898fedf51907e5cbe32 /app/views/commits/_diffs.html.haml | |
| parent | 65e4ad31476978e7f1c5cef41eb5a21e6068cbb2 (diff) | |
Fixed encoding issue for diff. Reordered merge request commits
Diffstat (limited to 'app/views/commits/_diffs.html.haml')
| -rw-r--r-- | app/views/commits/_diffs.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml index e3aa45d6344..29eae1c43c7 100644 --- a/app/views/commits/_diffs.html.haml +++ b/app/views/commits/_diffs.html.haml @@ -1,6 +1,6 @@ .file_stats = render "commits/diff_head", :diffs => diffs - + - diffs.each_with_index do |diff, i| - next if diff.diff.empty? - file = (@commit.tree / diff.b_path) @@ -16,7 +16,7 @@ %br/ .diff_file_content - if file.text? - = render :partial => "commits/text_file", :locals => { :diff => diff, :index => i } + = render "commits/text_file", :diff => diff, :index => i - elsif file.image? .diff_file_content_image %img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} |