2018-03-17 18:26:18 +05:30
|
|
|
= 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?
|
|
|
|
|
.row.empty-state.nothing-here-block
|
2018-11-08 19:23:39 +05:30
|
|
|
.col-12
|
2018-03-17 18:26:18 +05:30
|
|
|
.svg-content= image_tag 'illustrations/merge_request_changes_empty.svg'
|
2018-11-08 19:23:39 +05:30
|
|
|
.col-12
|
2018-03-17 18:26:18 +05:30
|
|
|
.text-content.text-center
|
|
|
|
|
%p
|
|
|
|
|
No changes between
|
|
|
|
|
%span.ref-name= @merge_request.source_branch
|
|
|
|
|
and
|
|
|
|
|
%span.ref-name= @merge_request.target_branch
|
2018-12-05 23:21:45 +05:30
|
|
|
.text-center= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-success'
|
2018-03-17 18:26:18 +05:30
|
|
|
- else
|
2018-11-08 19:23:39 +05:30
|
|
|
- diff_viewable = @merge_request_diff ? @merge_request_diff.viewable? : true
|
2018-03-17 18:26:18 +05:30
|
|
|
- if diff_viewable
|
|
|
|
|
= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, merge_request: true
|
