Merge branch 'additional-commits-integer-fix' into 'master'

Fix invalid integer value when more than 1000 commits Closes #34711 See merge request !12659

Merge branch 'additional-commits-integer-fix' into 'master'
Fix invalid integer value when more than 1000 commits Closes #34711 See merge request !12659
2520edef · Sean McGivern · 7f500acb · 19922c70 · 2520edef
Commit 2520edef authored Jul 06, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/views/projects/commits/_commits.html.haml app/views/projects/commits/_commits.html.haml +1 -1

No files found.
--- 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)