diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-08 10:54:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-08 10:54:33 +0000 |
| commit | 983d6a76dad32b908189ca14047b15b197c41df1 (patch) | |
| tree | 7071af6a14f968f9a526eb4805f0a76978a2bb44 | |
| parent | e8e2e8ca9790e47cf22569aa4d97b01937ea83ec (diff) | |
| parent | fee5e17fe04d9c7f990bdfab26afdfc98bdbbec9 (diff) | |
| download | gitlab-ce-983d6a76dad32b908189ca14047b15b197c41df1.tar.gz | |
Merge branch 'bugfix/graph-friendly-notes-number' into 'master'
Print notes number explained in the graph.
Closes #37224
See merge request !13949
| -rw-r--r-- | app/helpers/graph_helper.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/bugfix-graph-friendly-notes-number.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/graph_helper.rb b/app/helpers/graph_helper.rb index c53ea4519da..f7e17f5cc01 100644 --- 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 diff --git a/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml b/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml new file mode 100644 index 00000000000..3a99729fb48 --- /dev/null +++ b/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml @@ -0,0 +1,5 @@ +--- +title: Show notes number more user-friendly in the graph +merge_request: 13949 +author: Vladislav Kaverin +type: changed |