Merge branch 'patch-24' into 'master'
Fix graph notes number duplication. See merge request gitlab-org/gitlab-ce!15696
This commit is contained in:
commit
d87d1e7901
2 changed files with 6 additions and 1 deletions
|
@ -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
|
||||
|
|
5
changelogs/unreleased/patch-24.yml
Normal file
5
changelogs/unreleased/patch-24.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix graph notes number duplication.
|
||||
merge_request: 15696
|
||||
author: Vladislav Kaverin
|
||||
type: fixed
|
Loading…
Reference in a new issue