diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-08 19:04:15 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-08 19:04:15 +0300 |
| commit | bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8 (patch) | |
| tree | dd9da0f599dd7a9b96097af281ef39c116e6e572 /app/controllers/projects/merge_requests_controller.rb | |
| parent | f6fb47854974dfa44443555e0e8371053fd73e45 (diff) | |
| parent | fec48c6e170fb0032cece5d8cc3b06bb45caee57 (diff) | |
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/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 402420b851e..22de6680511 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -81,8 +81,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo # Get commits from repository # or from cache if already merged @commits = prepare_commits_for_rendering(@merge_request.commits) - @note_counts = Note.where(commit_id: @commits.map(&:id)) - .group(:commit_id).count render json: { html: view_to_html_string('projects/merge_requests/_commits') } end |