Merge branch 'patch-24' into 'master'

Fix graph notes number duplication.

See merge request gitlab-org/gitlab-ce!15696
This commit is contained in:
Sean McGivern 2017-12-06 14:46:53 +00:00
commit d87d1e7901
2 changed files with 6 additions and 1 deletions

View File

@ -8,7 +8,7 @@ module GraphHelper
# append note count
notes_count = @graph.notes[commit.id]
refs << "[#{notes_count} #{pluralize(notes_count, 'note')}]" if notes_count > 0
refs << "[#{pluralize(notes_count, 'note')}]" if notes_count > 0
refs
end

View File

@ -0,0 +1,5 @@
---
title: Fix graph notes number duplication.
merge_request: 15696
author: Vladislav Kaverin
type: fixed