mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 21:56:19 +10:00
Dmitriy ZaporozhetsandRobert Speicher
44d35a8225
Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
31 lines
911 B
Plaintext
31 lines
911 B
Plaintext
- if params[:view] == 'parallel'
|
|
- fluid_layout true
|
|
|
|
- diff_files = safe_diff_files(diffs)
|
|
|
|
.gray-content-block.second-block
|
|
.inline-parallel-buttons
|
|
.btn-group
|
|
= inline_diff_btn
|
|
= parallel_diff_btn
|
|
= render 'projects/diffs/stats', diff_files: diff_files
|
|
|
|
- if diff_files.count < diffs.size
|
|
= render 'projects/diffs/warning', diffs: diffs, shown_files_count: diff_files.count
|
|
|
|
.files
|
|
- diff_files.each_with_index do |diff_file, index|
|
|
- diff_commit = commit_for_diff(diff_file)
|
|
- blob = project.repository.blob_for_diff(diff_commit, diff_file)
|
|
- next unless blob
|
|
|
|
= render 'projects/diffs/file', i: index, project: project,
|
|
diff_file: diff_file, diff_commit: diff_commit, blob: blob
|
|
|
|
- if @diff_timeout
|
|
.alert.alert-danger
|
|
%h4
|
|
Failed to collect changes
|
|
%p
|
|
Maybe diff is really big and operation failed with timeout. Try to get diff locally
|