Merge branch 'bvl-mr-commit-note-counter' into 'master'

Count notes for commits and merge requests

See merge request gitlab-org/gitlab-ce!31912

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/usage_data_counters/note_counter.rb b/lib/gitlab/usage_data_counters/note_counter.rb
index e93a0bcfa27..672450ec82b 100644
--- a/lib/gitlab/usage_data_counters/note_counter.rb
+++ b/lib/gitlab/usage_data_counters/note_counter.rb
@@ -4,7 +4,7 @@ module Gitlab::UsageDataCounters
   class NoteCounter < BaseCounter
     KNOWN_EVENTS = %w[create].freeze
     PREFIX = 'note'
-    COUNTABLE_TYPES = %w[Snippet].freeze
+    COUNTABLE_TYPES = %w[Snippet Commit MergeRequest].freeze
 
     class << self
       def redis_key(event, noteable_type)
@@ -24,9 +24,9 @@ module Gitlab::UsageDataCounters
       end
 
       def totals
-        {
-          snippet_comment: read(:create, 'Snippet')
-        }
+        COUNTABLE_TYPES.map do |countable_type|
+          [:"#{countable_type.underscore}_comment", read(:create, countable_type)]
+        end.to_h
       end
 
       private