Commit 043c9f86 authored by Marin Jankovski's avatar Marin Jankovski

Change Diff to Changes in views.

parent 78a7a9b0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%li %li
#{commit.short_id} - #{commit.title} #{commit.short_id} - #{commit.title}
%h4 Diff: %h4 Changes:
- @diffs.each do |diff| - @diffs.each do |diff|
%li %li
%strong %strong
...@@ -23,6 +23,6 @@ ...@@ -23,6 +23,6 @@
%br %br
- if @compare.timeout - 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? - 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: ...@@ -6,7 +6,7 @@ Commits:
#{commit.short_id} - #{truncate(commit.title, length: 40)} #{commit.short_id} - #{truncate(commit.title, length: 40)}
\ \
\ \
Diff: Changes:
- @diffs.each do |diff| - @diffs.each do |diff|
\ \
\===================================== \=====================================
...@@ -22,4 +22,4 @@ Diff: ...@@ -22,4 +22,4 @@ Diff:
- if @compare.timeout - if @compare.timeout
Huge diff. To prevent performance issues it was hidden Huge diff. To prevent performance issues it was hidden
- elsif @compare.commits_over_limit? - elsif @compare.commits_over_limit?
Diff for big amount of commits is disabled Changes are not shown due to large amount of commits
- too_big = diff.diff.lines.count > 1000 - too_big = diff.diff.lines.count > 1000
- if too_big - 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}"} %table.text-file{class: "#{'hide' if too_big}"}
- each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line| - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line|
......
...@@ -18,17 +18,17 @@ ...@@ -18,17 +18,17 @@
- else - else
%ul.well-list= render Commit.decorate(@commits), project: @project %ul.well-list= render Commit.decorate(@commits), project: @project
%h4 Diff %h4 Changes
- if @diffs.present? - if @diffs.present?
= render "projects/commits/diffs", diffs: @diffs, project: @project = render "projects/commits/diffs", diffs: @diffs, project: @project
- elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE - elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
.bs-callout.bs-callout-danger .bs-callout.bs-callout-danger
%h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits. %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 - elsif @timeout
.bs-callout.bs-callout-danger .bs-callout.bs-callout-danger
%h4 Diff for this comparison is extremely large. %h4 Number of changed files for this comparison is extremely large.
%p Use command line to browse diff for this comparison. %p Use command line to browse through changes for this comparison.
- else - else
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%li.diffs-tab{data: {action: 'diffs'}} %li.diffs-tab{data: {action: 'diffs'}}
= link_to diffs_project_merge_request_path(@project, @merge_request) do = link_to diffs_project_merge_request_path(@project, @merge_request) do
%i.icon-list-alt %i.icon-list-alt
Diff Changes
- content_for :note_actions do - content_for :note_actions do
- if can?(current_user, :modify_merge_request, @merge_request) - if can?(current_user, :modify_merge_request, @merge_request)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- else - else
.bs-callout.bs-callout-warning .bs-callout.bs-callout-warning
%h4 %h4
Diff for this comparison is extremely large. Changes view for this comparison is extremely large.
%p %p
You can You can
= link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request, format: :diff), class: "vlink" = link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request, format: :diff), class: "vlink"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment