Merge branch 'bugfix/graph-friendly-notes-number' into 'master'

Print notes number explained in the graph. Closes #37224 See merge request !13949

Merge branch 'bugfix/graph-friendly-notes-number' into 'master'
983d6a76 · Rémy Coutable · e8e2e8ca · fee5e17f · 983d6a76 · 983d6a76
Commit 983d6a76 authored Sep 08, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

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

bugfix-graph-friendly-notes-number.yml changelogs/unreleased/bugfix-graph-friendly-notes-number.yml +5 -0

No files found.
--- a/app/helpers/graph_helper.rb
+++ b/app/helpers/graph_helper.rb
@@ -7,7 +7,8 @@ module GraphHelper
    refs << commit_refs.join(' ')

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

    refs
  end

--- a/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml
+++ b/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml
+---
+title: Show notes number more user-friendly in the graph
+merge_request: 13949
+author: Vladislav Kaverin
+type: changed