diff --git a/app/views/commits/_diff.html.haml b/app/views/commits/_diff.html.haml index 190c95dd745cb200ed73367e475ecfc4a025805c..cf5ef60512fb1dbb934cc31c7f7af58b40845e1b 100644 --- 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? diff --git a/app/views/commits/_diff_head.html.haml b/app/views/commits/_diff_head.html.haml index 6e32fca068f2636e212464ac68f6cf3e5260d3f0..20ec3cf11b000c01804c964c20bb3a02cfe33165 100644 --- 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 diff --git a/app/views/merge_requests/_diffs.html.haml b/app/views/merge_requests/_diffs.html.haml index ef6b0f1f4f860c59b1ab1544c431b3aaefef7f0f..9534da700d356dfe278560797a3b8e69863272e0 100644 --- 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) diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index 95a3b01acfe588951b4d8af292cf4d27fb2e0038..d67ab45e8f41bd047b978369dddd6087fa04120f 100644 --- 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 + = f.file_field :attachment %p.notify_controls