diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-04-19 12:51:51 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-04-19 12:51:51 +0000 |
| commit | a313aeceeeb20802ff9311199c839380414a588f (patch) | |
| tree | ff45c2b9783a28fac95363b729f9d38e7e77acf4 /app/models | |
| parent | 9cc011fdedab44f7423ed24150c93117abc689aa (diff) | |
| parent | 775211bc7076bba14d6e268fb324391124a2751f (diff) | |
| download | gitlab-ce-a313aeceeeb20802ff9311199c839380414a588f.tar.gz | |
Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'
Fix N+1 queries when loading participants for a commit note
Closes #45526
See merge request gitlab-org/gitlab-ce!18471
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index de860df4b9c..9750e9298ec 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -248,7 +248,7 @@ class Commit end def notes_with_associations - notes.includes(:author) + notes.includes(:author, :award_emoji) end def merge_requests |