diff options
Diffstat (limited to 'app/views/projects/merge_requests/diffs/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/diffs/_diffs.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/diffs/_diffs.html.haml b/app/views/projects/merge_requests/diffs/_diffs.html.haml new file mode 100644 index 00000000000..fb31e2fef00 --- /dev/null +++ b/app/views/projects/merge_requests/diffs/_diffs.html.haml @@ -0,0 +1,5 @@ +- if @merge_request_diff.collected? || @merge_request_diff.overflow? + = render 'projects/merge_requests/diffs/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} |