summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-06 08:00:27 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-06 08:00:27 +0000
commit2520edefb9a7481f575ac7bcdbcf89cb1432f27d (patch)
tree283007f2e0daa18f5b6a83a54cda2bd004e7fbf6 /app
parent7f500acb5f38f0ae5d4e2d51e27b6257e0800c3d (diff)
parent19922c705ef609265cc439fb48faee28f289ee6d (diff)
downloadgitlab-ce-2520edefb9a7481f575ac7bcdbcf89cb1432f27d.tar.gz
Merge branch 'additional-commits-integer-fix' into 'master'
Fix invalid integer value when more than 1000 commits Closes #34711 See merge request !12659
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/commits/_commits.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index cf8dffc8957..c764e35dd2a 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -12,4 +12,4 @@
- if hidden > 0
%li.alert.alert-warning
- = n_('%d additional commit has been omitted to prevent performance issues.', '%d additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden)
+ = n_('%s additional commit has been omitted to prevent performance issues.', '%s additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden)