diff options
Diffstat (limited to 'app/views/projects/merge_requests/show/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/show/_diffs.html.haml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml deleted file mode 100644 index 7f0913ea516..00000000000 --- a/app/views/projects/merge_requests/show/_diffs.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -- 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} |