diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-08 16:04:15 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-08 16:04:15 +0000 |
| commit | bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8 (patch) | |
| tree | dd9da0f599dd7a9b96097af281ef39c116e6e572 /app/models/merge_request.rb | |
| parent | f6fb47854974dfa44443555e0e8371053fd73e45 (diff) | |
| parent | fec48c6e170fb0032cece5d8cc3b06bb45caee57 (diff) | |
| download | gitlab-ce-bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8.tar.gz | |
Merge branch 'dm-notes-for-commit-id' into 'master'
Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us
Closes #34509
See merge request gitlab-org/gitlab-ce!15253
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 82d0ae90d77..efd8cca2947 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -576,7 +576,7 @@ class MergeRequest < ActiveRecord::Base commit_notes = Note .except(:order) .where(project_id: [source_project_id, target_project_id]) - .where(noteable_type: 'Commit', commit_id: commit_ids) + .for_commit_id(commit_ids) # We're using a UNION ALL here since this results in better performance # compared to using OR statements. We're using UNION ALL since the queries |