diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-11 19:46:09 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-11 19:46:09 +0800 |
| commit | eeb89a6010fce509f0cb6735e1ae9dc3cc5336d1 (patch) | |
| tree | 93fa24899e75cab6fc4d90ae542e009d9aeaf9d4 | |
| parent | c31c70b2fa01acef8842e68a3799ba72d0b3300a (diff) | |
| download | gitlab-ce-eeb89a6010fce509f0cb6735e1ae9dc3cc5336d1.tar.gz | |
Avoid Rails generating complicated query, see:
https://gitlab.com/gitlab-org/gitlab-ce/builds/14070787
| -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 5c1f7e69ee8..e3f3b14f993 100755 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -39,7 +39,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 |