Merge branch 'patch-24' into 'master'

Fix graph notes number duplication. See merge request gitlab-org/gitlab-ce!15696

Merge branch 'patch-24' into 'master'
d87d1e79 · Sean McGivern · 483b5f1b · 5efd2dd0 · d87d1e79 · d87d1e79
Commit d87d1e79 authored Dec 06, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

graph_helper.rb app/helpers/graph_helper.rb +1 -1

patch-24.yml changelogs/unreleased/patch-24.yml +5 -0

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

--- a/changelogs/unreleased/patch-24.yml
+++ b/changelogs/unreleased/patch-24.yml
+---
+title: Fix graph notes number duplication.
+merge_request: 15696
+author: Vladislav Kaverin
+type: fixed