diff options
| author | Riccardo Padovani <riccardo@rpadovani.com> | 2018-03-07 13:16:38 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 13:16:38 +0300 |
| commit | e2bdce8defbbd5a11d50115e3d52498d90417ac2 (patch) | |
| tree | 5d450508890c9219f2e8e63a911f677aace80c31 /lib/gitlab/contributions_calendar.rb | |
| parent | cfe203fa3a77adbb33f877c98af5e117b1ccd281 (diff) | |
Count discussions on issues and merge requests as contributions for the contributions calendar
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 02d3763514e..d7369060cc5 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: %w(Note DiffNote)) + .having(action: [Event::COMMENTED]) union = Gitlab::SQL::Union.new([repo_events, issue_events, mr_events, note_events]) events = Event.find_by_sql(union.to_sql).map(&:attributes) |