2017-06-29 17:19:09 -04:00
|
|
|
= render 'projects/merge_requests/diffs/version_controls'
|
|
|
|
|
= render 'projects/merge_requests/diffs/different_base'
|
|
|
|
|
= render 'projects/merge_requests/diffs/not_all_comments_displayed'
|
|
|
|
|
= render 'projects/merge_requests/diffs/commit_widget'
|
|
|
|
|
|
|
|
|
|
- if @merge_request_diff&.empty?
|
2017-11-29 23:59:35 -05:00
|
|
|
.nothing-here-block
|
|
|
|
|
= image_tag 'illustrations/merge_request_changes_empty.svg'
|
|
|
|
|
%p
|
|
|
|
|
Nothing to merge from
|
|
|
|
|
%strong= @merge_request.source_branch
|
|
|
|
|
into
|
|
|
|
|
%strong= @merge_request.target_branch
|
|
|
|
|
%p= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-save'
|
2017-06-29 17:19:09 -04:00
|
|
|
- else
|
|
|
|
|
- diff_viewable = @merge_request_diff ? @merge_request_diff.collected? || @merge_request_diff.overflow? : true
|
|
|
|
|
- if diff_viewable
|
|
|
|
|
= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, merge_request: true
|
