Download as
Browse Code »

Commit 9a996460e38ae901386b4f7690bd03a77e8394ea

Authored by Dmitriy Zaporozhets
2 parents 08538da2 d6d0a172
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/views/projects/commits/_diffs.html.haml
  Diff comments   View file @9a99646
... ... @@ -2,9 +2,9 @@
2 2 .alert.alert-block
3 3 %p
4 4 %strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
5   - %p To prevent performance issue we rejected diff information.
  5 + %p To preserve performance the diff is not shown.
6 6 %p
7   - But if you still want to see diff
  7 + But if you still want to see the diff
8 8 = link_to "click this link", project_commit_path(project, @commit, force_show_diff: true), class: "underlined_link"
9 9  
10 10 %p.commit-stat-summary
... ...
app/views/projects/compare/show.html.haml
  Diff comments   View file @9a99646
... ... @@ -8,8 +8,8 @@
8 8 - if @commits.size > 100
9 9 .alert.alert-block
10 10 %p
11   - %strong Warning! This comparison include 100+ commits.
12   - %p To prevent performance issue we don't show diff information.
  11 + %strong Warning! This comparison includes more than 100 commits.
  12 + %p To preserve performance the line diff is not shown.
13 13  
14 14 - if @commits.present?
15 15 %div.ui-box
... ...