merge reques diff: files list displayed

Dmitriy Zaporozhets
1 parent 5c6417ce
Showing 4 changed files with 5 additions and 4 deletions Show diff stats
app/views/commits/_diff.html.haml
app/views/commits/_diff_head.html.haml
app/views/merge_requests/_diffs.html.haml
app/views/notes/_form.html.haml
 .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?
 %ul.bordered-list
-  - @commit.diffs.each do |diff|
+  - diffs.each do |diff|
     %li
       - if diff.deleted_file
         %span.removed_file
+.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)
@@ -19,8 +19,7 @@
       %br
       = f.label :attachment
       %cite.cgray (less than 10 MB)
-      %br
-      %br
+      &nbsp;
       = f.file_field :attachment
       %p.notify_controls
1	.file_stats	1	.file_stats
2	- = render "commits/diff_head"	2	+ = render "commits/diff_head", :diffs => @commit.diffs
3		3
4	- @commit.diffs.each_with_index do \|diff, i\|	4	- @commit.diffs.each_with_index do \|diff, i\|
5	- next if diff.diff.empty?	5	- next if diff.diff.empty?
1	%ul.bordered-list	1	%ul.bordered-list
2	- - @commit.diffs.each do \|diff\|	2	+ - diffs.each do \|diff\|
3	%li	3	%li
4	- if diff.deleted_file	4	- if diff.deleted_file
5	%span.removed_file	5	%span.removed_file
		1	+.file_stats
		2	+ = render "commits/diff_head", :diffs => @diffs
1	- @diffs.each_with_index do \|diff, i\|	3	- @diffs.each_with_index do \|diff, i\|
2	- next if diff.diff.empty?	4	- next if diff.diff.empty?
3	- file = (@commit.tree / diff.b_path)	5	- file = (@commit.tree / diff.b_path)