diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 14:46:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-06 14:46:53 +0000 |
| commit | d87d1e7901f7a71c6f0541c709be26fce3db7e4b (patch) | |
| tree | d1d1ce0ab0a840d59b5ccbf1bc30b997c1e513cc | |
| parent | 483b5f1bfac5e338fab0e11f2045254f70df8fc1 (diff) | |
| parent | 5efd2dd035f700ed0ff2a14fb60e17d8259749e5 (diff) | |
| download | gitlab-ce-d87d1e7901f7a71c6f0541c709be26fce3db7e4b.tar.gz | |
Merge branch 'patch-24' into 'master'
Fix graph notes number duplication.
See merge request gitlab-org/gitlab-ce!15696
| -rw-r--r-- | app/helpers/graph_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-24.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/graph_helper.rb b/app/helpers/graph_helper.rb index f7e17f5cc01..6d303ba857d 100644 --- a/app/helpers/graph_helper.rb +++ b/app/helpers/graph_helper.rb @@ -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 diff --git a/changelogs/unreleased/patch-24.yml b/changelogs/unreleased/patch-24.yml new file mode 100644 index 00000000000..a670eb3ab56 --- /dev/null +++ b/changelogs/unreleased/patch-24.yml @@ -0,0 +1,5 @@ +--- +title: Fix graph notes number duplication. +merge_request: 15696 +author: Vladislav Kaverin +type: fixed |