diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 02:37:27 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 02:37:27 +0800 |
| commit | 39d07799f1557ef8c78b1dcdcec8fda4edbc9210 (patch) | |
| tree | 1e4f7afe47cde9caaa236b859830759700f23b03 /app/controllers/projects/merge_requests_controller.rb | |
| parent | 0b35dd07428558bc5d9270d4a1d50d39a0ba65eb (diff) | |
| download | gitlab-ce-39d07799f1557ef8c78b1dcdcec8fda4edbc9210.tar.gz | |
Use preload to avoid Rails using JOIN
Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rwxr-xr-x | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 224b44db397..09dc8b38229 100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -38,7 +38,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @collection_type = "MergeRequest" @merge_requests = merge_requests_collection @merge_requests = @merge_requests.page(params[:page]) - @merge_requests = @merge_requests.includes(merge_request_diff: :merge_request) + @merge_requests = @merge_requests.preload(merge_request_diff: :merge_request) @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type) if @merge_requests.out_of_range? && @merge_requests.total_pages != 0 |