deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed encoding issue for diff. Reordered merge request commits

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-15 00:41:36 +02:00
parent 65e4ad3147
commit ef396d08fc
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/commits/_diffs.html.haml
View file

@ -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)}"}