Change Diff to Changes in views.
This commit is contained in:
parent
78a7a9b0be
commit
043c9f8640
|
|
@ -7,7 +7,7 @@
|
|||
%li
|
||||
#{commit.short_id} - #{commit.title}
|
||||
|
||||
%h4 Diff:
|
||||
%h4 Changes:
|
||||
- @diffs.each do |diff|
|
||||
%li
|
||||
%strong
|
||||
|
|
@ -23,6 +23,6 @@
|
|||
%br
|
||||
|
||||
- if @compare.timeout
|
||||
%h5 Huge diff. To prevent performance issues it was hidden
|
||||
%h5 To prevent performance issues changes are hidden
|
||||
- elsif @compare.commits_over_limit?
|
||||
%h5 Diff for big amount of commits is disabled
|
||||
%h5 Changes are not shown due to large amount of commits
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Commits:
|
|||
#{commit.short_id} - #{truncate(commit.title, length: 40)}
|
||||
\
|
||||
\
|
||||
Diff:
|
||||
Changes:
|
||||
- @diffs.each do |diff|
|
||||
\
|
||||
\=====================================
|
||||
|
|
@ -22,4 +22,4 @@ Diff:
|
|||
- if @compare.timeout
|
||||
Huge diff. To prevent performance issues it was hidden
|
||||
- elsif @compare.commits_over_limit?
|
||||
Diff for big amount of commits is disabled
|
||||
Changes are not shown due to large amount of commits
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
- too_big = diff.diff.lines.count > 1000
|
||||
- if too_big
|
||||
%a.supp_diff_link Diff suppressed. Click to show
|
||||
%a.supp_diff_link Changes suppressed. Click to show
|
||||
|
||||
%table.text-file{class: "#{'hide' if too_big}"}
|
||||
- each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line|
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@
|
|||
- else
|
||||
%ul.well-list= render Commit.decorate(@commits), project: @project
|
||||
|
||||
%h4 Diff
|
||||
%h4 Changes
|
||||
- if @diffs.present?
|
||||
= render "projects/commits/diffs", diffs: @diffs, project: @project
|
||||
- elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
|
||||
.bs-callout.bs-callout-danger
|
||||
%h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
|
||||
%p To preserve performance the line diff is not shown.
|
||||
%p To preserve performance the line changes are not shown.
|
||||
- elsif @timeout
|
||||
.bs-callout.bs-callout-danger
|
||||
%h4 Diff for this comparison is extremely large.
|
||||
%p Use command line to browse diff for this comparison.
|
||||
%h4 Number of changed files for this comparison is extremely large.
|
||||
%p Use command line to browse through changes for this comparison.
|
||||
|
||||
|
||||
- else
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
%li.diffs-tab{data: {action: 'diffs'}}
|
||||
= link_to diffs_project_merge_request_path(@project, @merge_request) do
|
||||
%i.icon-list-alt
|
||||
Diff
|
||||
Changes
|
||||
|
||||
- content_for :note_actions do
|
||||
- if can?(current_user, :modify_merge_request, @merge_request)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
- else
|
||||
.bs-callout.bs-callout-warning
|
||||
%h4
|
||||
Diff for this comparison is extremely large.
|
||||
Changes view for this comparison is extremely large.
|
||||
%p
|
||||
You can
|
||||
= link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request, format: :diff), class: "vlink"
|
||||
|
|
|
|||
Loading…
Reference in New Issue