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

merge reques diff: files list displayed

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-23 21:08:12 +02:00
parent 5c6417ce07
commit 16a98387c2
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/commits/_diff.html.haml
View file

@ -1,5 +1,5 @@
.file_stats .file_stats
= render "commits/diff_head" = render "commits/diff_head", :diffs => @commit.diffs
- @commit.diffs.each_with_index do |diff, i| - @commit.diffs.each_with_index do |diff, i|
- next if diff.diff.empty? - next if diff.diff.empty?

2
app/views/commits/_diff_head.html.haml
View file

@ -1,5 +1,5 @@
%ul.bordered-list %ul.bordered-list
- @commit.diffs.each do |diff| - diffs.each do |diff|
%li %li
- if diff.deleted_file - if diff.deleted_file
%span.removed_file %span.removed_file

2
app/views/merge_requests/_diffs.html.haml
View file

@ -1,3 +1,5 @@
.file_stats
= render "commits/diff_head", :diffs => @diffs
- @diffs.each_with_index do |diff, i| - @diffs.each_with_index do |diff, i|
- next if diff.diff.empty? - next if diff.diff.empty?
- file = (@commit.tree / diff.b_path) - file = (@commit.tree / diff.b_path)

3
app/views/notes/_form.html.haml
View file

@ -19,8 +19,7 @@
%br %br
= f.label :attachment = f.label :attachment
%cite.cgray (less than 10 MB) %cite.cgray (less than 10 MB)
%br  
%br
= f.file_field :attachment = f.file_field :attachment
%p.notify_controls %p.notify_controls