MR: Handle broken diff ex. in case its too huge

2012-07-05 22:59:37 +03:00 · 2012-07-05 22:59:37 +03:00 · 0a6b64e6a9
commit 0a6b64e6a9
parent d40b9ce26d
3 changed files with 38 additions and 19 deletions
--- a/app/views/merge_requests/show/_diffs.html.haml
+++ b/app/views/merge_requests/show/_diffs.html.haml
@ -1,3 +1,8 @@
-= render "commits/diffs", :diffs => @diffs
- if @diffs.empty?
-  %p.cgray Nothing to merge
+- if @merge_request.valid_diffs?
+  = render "commits/diffs", :diffs => @diffs
+- elsif @merge_request.broken_diffs?
+  %h4.nothing_here_message 
+    Can't load diff.
+    You can #{link_to "download MR patch", raw_project_merge_request_path(@project, @merge_request), :class => "vlink"} instead.
+- else
+  %h4.nothing_here_message Nothing to merge