diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-10 02:36:20 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-10 21:11:29 +0000 |
| commit | 42d4ebbc2722323f353f3742e6a4e582620037db (patch) | |
| tree | e56e1939055ec7122ee4c5d0eef0b516fd6b4e0c /app | |
| parent | 077f443b67ce1a80182dd12b604c26496b0dbd6b (diff) | |
| download | gitlab-ce-42d4ebbc2722323f353f3742e6a4e582620037db.tar.gz | |
Merge branch 'sh-fix-real-size-warnings' into 'master'
Fix broken templated "Too many changes to show" text
Closes #56138
See merge request gitlab-org/gitlab-ce!24282
(cherry picked from commit 819de8e8084e1b0cc102664abb8bbc836ff99ede)
488d7d1f Fix broken templated "Too many changes to show" text
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/diffs/_warning.html.haml | 2 |
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 } |