diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-03-02 00:37:23 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-03-02 00:37:23 +0000 |
| commit | c1b50f858f94ee81b375ab80d1273b1e31a38307 (patch) | |
| tree | 1a277de753cf0e0265d87a51a5d3e586ffa134ec /lib | |
| parent | 5c9aa45489aee7cd1edaa15a30fb8a3aa24417a8 (diff) | |
| parent | a769292c672dea9fae702dd75f643a14752110ee (diff) | |
| download | gitlab-ce-c1b50f858f94ee81b375ab80d1273b1e31a38307.tar.gz | |
Merge branch 'sh-optimize-calendar-activities' into 'master'
Eliminate most N+1 queries loading UserController#calendar_activities
Closes #58392
See merge request gitlab-org/gitlab-ce!25697
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/contributions_calendar.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb index 5ed6427072a..f7d046600e8 100644 --- a/lib/gitlab/contributions_calendar.rb +++ b/lib/gitlab/contributions_calendar.rb @@ -49,6 +49,7 @@ module Gitlab Event.contributions.where(author_id: contributor.id) .where(created_at: date.beginning_of_day..date.end_of_day) .where(project_id: projects) + .with_associations end # rubocop: enable CodeReuse/ActiveRecord |