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

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