gitlabhq/app/views/merge_requests/show/_diffs.html.haml

- 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 it", project_merge_request_path(@project, @merge_request), format: :diff, class: "vlink"
    instead.
- else
  %h4.nothing_here_message Nothing to merge
MR: Handle broken diff ex. in case its too huge 2012-07-05 21:59:37 +02:00			`- if @merge_request.valid_diffs?`
Fully embrace Ruby 1.9 hash syntax Didn't bother with files in db/, config/, or features/ 2012-08-11 00:07:50 +02:00			`= render "commits/diffs", diffs: @diffs`
MR: Handle broken diff ex. in case its too huge 2012-07-05 21:59:37 +02:00			`- elsif @merge_request.broken_diffs?`
Remove merge_request#raw and replace it with formats to #show Needed to add a constraint on the id. Otherwise the format was parsed as part of the id. 2012-11-22 21:50:36 +01:00			`%h4.nothing_here_message`
MR: Handle broken diff ex. in case its too huge 2012-07-05 21:59:37 +02:00			`Can't load diff.`
Remove merge_request#raw and replace it with formats to #show Needed to add a constraint on the id. Otherwise the format was parsed as part of the id. 2012-11-22 21:50:36 +01:00			`You can`
			`= link_to "download it", project_merge_request_path(@project, @merge_request), format: :diff, class: "vlink"`
			`instead.`
MR: Handle broken diff ex. in case its too huge 2012-07-05 21:59:37 +02:00			`- else`
			`%h4.nothing_here_message Nothing to merge`