2017-08-17 22:00:37 +05:30
|
|
|
- if @merge_request_diff.collected? || @merge_request_diff.overflow?
|
2017-09-10 17:25:29 +05:30
|
|
|
= render 'projects/merge_requests/diffs/versions'
|
|
|
|
|
= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, merge_request: true
|
2014-09-02 18:07:02 +05:30
|
|
|
- elsif @merge_request_diff.empty?
|
|
|
|
|
.nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
|
