diff options
| author | Riccardo Padovani <riccardo@rpadovani.com> | 2018-03-05 17:51:20 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-05 17:51:20 +0300 |
| commit | 5c5fc89b6c2ca4a65bd007dfedb1a026d66c7bff (patch) | |
| tree | e7600115473bc44140f6068c477f277569a15e96 /lib/gitlab/contributions_calendar.rb | |
| parent | 5492ea1733318f405fe17cc24bced4be188d98c5 (diff) | |
#43691: DiffNotes not counted by ContributionsCalendar
Diffstat (limited to 'lib/gitlab/contributions_calendar.rb')
| -rw-r--r-- | lib/gitlab/contributions_calendar.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb index 9576d5a3fd8..02d3763514e 100644 --- a/lib/gitlab/contributions_calendar.rb +++ b/lib/gitlab/contributions_calendar.rb @@ -23,7 +23,7 @@ module Gitlab mr_events = event_counts(date_from, :merge_requests) .having(action: [Event::MERGED, Event::CREATED, Event::CLOSED], target_type: "MergeRequest") note_events = event_counts(date_from, :merge_requests) - .having(action: [Event::COMMENTED], target_type: "Note") + .having(action: [Event::COMMENTED], target_type: %w(Note DiffNote)) union = Gitlab::SQL::Union.new([repo_events, issue_events, mr_events, note_events]) events = Event.find_by_sql(union.to_sql).map(&:attributes) |