merge reques diff: files list displayed

2012-01-23 21:08:12 +02:00 · 2012-01-23 21:08:12 +02:00 · 16a98387c2
parent 5c6417ce07
commit 16a98387c2
4 changed files with 5 additions and 4 deletions
--- a/app/views/commits/_diff.html.haml
+++ b/app/views/commits/_diff.html.haml
@ -1,5 +1,5 @@
 .file_stats
-  = render "commits/diff_head"
+  = render "commits/diff_head", :diffs => @commit.diffs

 - @commit.diffs.each_with_index do |diff, i|
  - next if diff.diff.empty?
--- a/app/views/commits/_diff_head.html.haml
+++ b/app/views/commits/_diff_head.html.haml
@ -1,5 +1,5 @@
 %ul.bordered-list
-  - @commit.diffs.each do |diff|
+  - diffs.each do |diff|
    %li
      - if diff.deleted_file
        %span.removed_file
--- a/app/views/merge_requests/_diffs.html.haml
+++ b/app/views/merge_requests/_diffs.html.haml
@ -1,3 +1,5 @@
+.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)
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@ -19,8 +19,7 @@
      %br
      = f.label :attachment
      %cite.cgray (less than 10 MB)
-      %br
-      %br
+      &nbsp;
      = f.file_field :attachment
      
      %p.notify_controls