Commit afcaf662c9220d5b5c6261a5ba9704b69c79d3b4
Exists in
spb-stable
and in
3 other branches
Merge branch 'rename_mr_diff_tab' into 'master'
Rename Diff to Changes
Showing
6 changed files
with
12 additions
and
12 deletions
Show diff stats
app/views/notify/repository_push_email.html.haml
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | %li | 7 | %li |
| 8 | #{commit.short_id} - #{commit.title} | 8 | #{commit.short_id} - #{commit.title} |
| 9 | 9 | ||
| 10 | -%h4 Diff: | 10 | +%h4 Changes: |
| 11 | - @diffs.each do |diff| | 11 | - @diffs.each do |diff| |
| 12 | %li | 12 | %li |
| 13 | %strong | 13 | %strong |
| @@ -23,6 +23,6 @@ | @@ -23,6 +23,6 @@ | ||
| 23 | %br | 23 | %br |
| 24 | 24 | ||
| 25 | - if @compare.timeout | 25 | - if @compare.timeout |
| 26 | - %h5 Huge diff. To prevent performance issues it was hidden | 26 | + %h5 To prevent performance issues changes are hidden |
| 27 | - elsif @compare.commits_over_limit? | 27 | - elsif @compare.commits_over_limit? |
| 28 | - %h5 Diff for big amount of commits is disabled | 28 | + %h5 Changes are not shown due to large amount of commits |
app/views/notify/repository_push_email.text.haml
| @@ -6,7 +6,7 @@ Commits: | @@ -6,7 +6,7 @@ Commits: | ||
| 6 | #{commit.short_id} - #{truncate(commit.title, length: 40)} | 6 | #{commit.short_id} - #{truncate(commit.title, length: 40)} |
| 7 | \ | 7 | \ |
| 8 | \ | 8 | \ |
| 9 | -Diff: | 9 | +Changes: |
| 10 | - @diffs.each do |diff| | 10 | - @diffs.each do |diff| |
| 11 | \ | 11 | \ |
| 12 | \===================================== | 12 | \===================================== |
| @@ -22,4 +22,4 @@ Diff: | @@ -22,4 +22,4 @@ Diff: | ||
| 22 | - if @compare.timeout | 22 | - if @compare.timeout |
| 23 | Huge diff. To prevent performance issues it was hidden | 23 | Huge diff. To prevent performance issues it was hidden |
| 24 | - elsif @compare.commits_over_limit? | 24 | - elsif @compare.commits_over_limit? |
| 25 | - Diff for big amount of commits is disabled | 25 | + Changes are not shown due to large amount of commits |
app/views/projects/commits/_text_file.html.haml
| 1 | - too_big = diff.diff.lines.count > 1000 | 1 | - too_big = diff.diff.lines.count > 1000 |
| 2 | - if too_big | 2 | - if too_big |
| 3 | - %a.supp_diff_link Diff suppressed. Click to show | 3 | + %a.supp_diff_link Changes suppressed. Click to show |
| 4 | 4 | ||
| 5 | %table.text-file{class: "#{'hide' if too_big}"} | 5 | %table.text-file{class: "#{'hide' if too_big}"} |
| 6 | - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line| | 6 | - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line| |
app/views/projects/compare/show.html.haml
| @@ -18,17 +18,17 @@ | @@ -18,17 +18,17 @@ | ||
| 18 | - else | 18 | - else |
| 19 | %ul.well-list= render Commit.decorate(@commits), project: @project | 19 | %ul.well-list= render Commit.decorate(@commits), project: @project |
| 20 | 20 | ||
| 21 | - %h4 Diff | 21 | + %h4 Changes |
| 22 | - if @diffs.present? | 22 | - if @diffs.present? |
| 23 | = render "projects/commits/diffs", diffs: @diffs, project: @project | 23 | = render "projects/commits/diffs", diffs: @diffs, project: @project |
| 24 | - elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE | 24 | - elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE |
| 25 | .bs-callout.bs-callout-danger | 25 | .bs-callout.bs-callout-danger |
| 26 | %h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits. | 26 | %h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits. |
| 27 | - %p To preserve performance the line diff is not shown. | 27 | + %p To preserve performance the line changes are not shown. |
| 28 | - elsif @timeout | 28 | - elsif @timeout |
| 29 | .bs-callout.bs-callout-danger | 29 | .bs-callout.bs-callout-danger |
| 30 | - %h4 Diff for this comparison is extremely large. | ||
| 31 | - %p Use command line to browse diff for this comparison. | 30 | + %h4 Number of changed files for this comparison is extremely large. |
| 31 | + %p Use command line to browse through changes for this comparison. | ||
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | - else | 34 | - else |
app/views/projects/merge_requests/_show.html.haml
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | %li.diffs-tab{data: {action: 'diffs'}} | 20 | %li.diffs-tab{data: {action: 'diffs'}} |
| 21 | = link_to diffs_project_merge_request_path(@project, @merge_request) do | 21 | = link_to diffs_project_merge_request_path(@project, @merge_request) do |
| 22 | %i.icon-list-alt | 22 | %i.icon-list-alt |
| 23 | - Diff | 23 | + Changes |
| 24 | 24 | ||
| 25 | - content_for :note_actions do | 25 | - content_for :note_actions do |
| 26 | - if can?(current_user, :modify_merge_request, @merge_request) | 26 | - if can?(current_user, :modify_merge_request, @merge_request) |
app/views/projects/merge_requests/show/_diffs.html.haml
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | - else | 5 | - else |
| 6 | .bs-callout.bs-callout-warning | 6 | .bs-callout.bs-callout-warning |
| 7 | %h4 | 7 | %h4 |
| 8 | - Diff for this comparison is extremely large. | 8 | + Changes view for this comparison is extremely large. |
| 9 | %p | 9 | %p |
| 10 | You can | 10 | You can |
| 11 | = link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request, format: :diff), class: "vlink" | 11 | = link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request, format: :diff), class: "vlink" |