gitlab-org--gitlab-foss/app/views/projects/merge_requests/show/_diffs.html.haml

- if @merge_request_diff.collected? || @merge_request_diff.overflow?
  = render 'projects/merge_requests/show/versions'
  = render "projects/diffs/diffs", diffs: @diffs, environment: @environment
- elsif @merge_request_diff.empty?
  .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
Show 'too many changes' message for merge request 2016-12-30 14:16:25 -05:00			`- if @merge_request_diff.collected? \|\| @merge_request_diff.overflow?`
Make merge request diff works with new FileCollection logic Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2016-08-15 10:57:19 -04:00			`= render 'projects/merge_requests/show/versions'`
Add 'View on [env]' link to blobs and individual files in diffs 2017-01-29 14:38:00 -05:00			`= render "projects/diffs/diffs", diffs: @diffs, environment: @environment`
Render MR diff correctly Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-01-22 08:20:40 -05:00			`- elsif @merge_request_diff.empty?`
Refactor scss Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-02-20 06:51:22 -05:00			`.nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}`