mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-26 13:06:41 +10:00
Dmitriy Zaporozhets
a9280de11f
If you cancel edit you will be redirected back to merge request If you submit changes you will be redirected back to merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
86 lines
3.9 KiB
Plaintext
86 lines
3.9 KiB
Plaintext
- @suppress_diff ||= @suppress_diff || @force_suppress_diff
|
|
- if @suppress_diff
|
|
.alert.alert-warning
|
|
%p
|
|
%strong Warning! This is a large diff.
|
|
%p
|
|
To preserve performance the diff is not shown.
|
|
- if current_controller?(:commit) or current_controller?(:merge_requests)
|
|
Please, download the diff as
|
|
- if current_controller?(:commit)
|
|
= link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined-link"
|
|
or
|
|
= link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined-link"
|
|
- else
|
|
= link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined-link"
|
|
or
|
|
= link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined-link"
|
|
instead.
|
|
- unless @force_suppress_diff
|
|
%p
|
|
If you still want to see the diff
|
|
= link_to "click this link", url_for(force_show_diff: true), class: "underlined-link"
|
|
|
|
%p.commit-stat-summary
|
|
Showing
|
|
%strong.cdark #{pluralize(diffs.count, "changed file")}
|
|
- if current_controller?(:commit)
|
|
- unless @commit.has_zero_stats?
|
|
with
|
|
%strong.cgreen #{@commit.stats.additions} additions
|
|
and
|
|
%strong.cred #{@commit.stats.deletions} deletions
|
|
- if params[:view] == 'parallel'
|
|
= link_to "Inline Diff", url_for(view: 'inline'), {id: "commit-diff-viewtype", class: 'btn btn-tiny pull-right'}
|
|
- else
|
|
= link_to "Side-by-side Diff", url_for(view: 'parallel'), {id: "commit-diff-viewtype", class: 'btn btn-tiny pull-right'}
|
|
.file-stats
|
|
= render "projects/commits/diff_head", diffs: diffs
|
|
|
|
.files
|
|
- unless @suppress_diff
|
|
- diffs.each_with_index do |diff, i|
|
|
- next if diff.diff.empty?
|
|
- file = project.repository.blob_at(@commit.id, diff.new_path)
|
|
- file = project.repository.blob_at(@commit.parent_id, diff.old_path) unless file
|
|
- next unless file
|
|
.diff-file{id: "diff-#{i}"}
|
|
.diff-header{id: "file-path-#{hexdigest(diff.new_path || diff.old_path)}"}
|
|
- if diff.deleted_file
|
|
%span= diff.old_path
|
|
|
|
.diff-btn-group
|
|
- if @commit.parent_ids.present?
|
|
= link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), { class: 'btn btn-small view-file' } do
|
|
View file @
|
|
%span.commit-short-id= @commit.short_id(6)
|
|
- else
|
|
%span= diff.new_path
|
|
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
|
|
%span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
|
|
|
|
.diff-btn-group
|
|
- if @merge_request && @merge_request.source_project
|
|
= link_to project_edit_tree_path(@merge_request.source_project, tree_join(@merge_request.source_branch, diff.new_path), from_merge_request_id: @merge_request.id), { class: 'btn btn-small' } do
|
|
Edit
|
|
|
|
|
|
= link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), { class: 'btn btn-small view-file' } do
|
|
View file @
|
|
%span.commit-short-id= @commit.short_id(6)
|
|
|
|
|
|
.diff-content
|
|
-# Skipp all non non-supported blobs
|
|
- next unless file.respond_to?('text?')
|
|
- if file.text?
|
|
- if params[:view] == 'parallel'
|
|
= render "projects/commits/parallel_view", diff: diff, project: project, file: file, index: i
|
|
- else
|
|
= render "projects/commits/text_file", diff: diff, index: i
|
|
- elsif file.image?
|
|
- old_file = project.repository.blob_at(@commit.parent_id, diff.old_path) if @commit.parent_id
|
|
= render "projects/commits/image", diff: diff, old_file: old_file, file: file, index: i
|
|
- else
|
|
.nothing-here-block No preview for this file type
|