Download as
Browse Code »

Commit 16a98387c24e095a930b18f65065d0ea26eb6a12

Authored by Dmitriy Zaporozhets
1 parent 5c6417ce
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

merge reques diff: files list displayed

Showing 4 changed files with 5 additions and 4 deletions   Show diff stats
app/views/commits/_diff.html.haml
  Diff comments   View file @16a9838
1 1 .file_stats
2   - = render "commits/diff_head"
  2 + = render "commits/diff_head", :diffs => @commit.diffs
3 3  
4 4 - @commit.diffs.each_with_index do |diff, i|
5 5 - next if diff.diff.empty?
... ...
app/views/commits/_diff_head.html.haml
  Diff comments   View file @16a9838
1 1 %ul.bordered-list
2   - - @commit.diffs.each do |diff|
  2 + - diffs.each do |diff|
3 3 %li
4 4 - if diff.deleted_file
5 5 %span.removed_file
... ...
app/views/merge_requests/_diffs.html.haml
  Diff comments   View file @16a9838
  1 +.file_stats
  2 + = render "commits/diff_head", :diffs => @diffs
1 3 - @diffs.each_with_index do |diff, i|
2 4 - next if diff.diff.empty?
3 5 - file = (@commit.tree / diff.b_path)
... ...
app/views/notes/_form.html.haml
  Diff comments   View file @16a9838
... ... @@ -19,8 +19,7 @@
19 19 %br
20 20 = f.label :attachment
21 21 %cite.cgray (less than 10 MB)
22   - %br
23   - %br
  22 +  
24 23 = f.file_field :attachment
25 24  
26 25 %p.notify_controls
... ...