summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-09 15:11:16 -0800
committerStan Hu <stanhu@gmail.com>2019-01-09 15:14:07 -0800
commit488d7d1f3da605c0a7afcbb9212b10665be89819 (patch)
treed4bc1676795ece0941985784aa942e904f807250 /app/views/projects/diffs
parent4a6c7661edae664a7f6366201d017e24d8f42026 (diff)
downloadgitlab-ce-488d7d1f3da605c0a7afcbb9212b10665be89819.tar.gz
Fix broken templated "Too many changes to show" text
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23230 broke the external string in 11.6. This fixes that and adds a spec. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56138
Diffstat (limited to 'app/views/projects/diffs')
-rw-r--r--app/views/projects/diffs/_warning.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml
index 2eef599cf84..2cc3d921abc 100644
--- a/app/views/projects/diffs/_warning.html.haml
+++ b/app/views/projects/diffs/_warning.html.haml
@@ -9,4 +9,4 @@
= link_to _("Plain diff"), merge_request_path(@merge_request, format: :diff), class: "btn btn-sm"
= link_to _("Email patch"), merge_request_path(@merge_request, format: :patch), class: "btn btn-sm"
%p
- = _("To preserve performance only <strong>%{display_size} of ${real_size}</strong> files are displayed.").html_safe % { display_size: diff_files.size, real_size: diff_files.real_size }
+ = _("To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed.").html_safe % { display_size: diff_files.size, real_size: diff_files.real_size }