diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-04-12 20:16:26 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-04-12 20:16:26 +0000 |
| commit | 6ce2cc619c079ce207b8266e26165464f4af28b2 (patch) | |
| tree | 7320d6d80473c2c337da3c04aa1209a503106f0b | |
| parent | 0fa00e8461bc70d20006de4e2e30d07eabda1e69 (diff) | |
| parent | 2263ce97600076348579f2623d659bb37de5aa4c (diff) | |
| download | gitlab-ce-6ce2cc619c079ce207b8266e26165464f4af28b2.tar.gz | |
Merge branch 'fix-preloading-merge_request_diff' into 'master'
Use preload to avoid Rails using JOIN
See merge request !10666
| -rwxr-xr-x | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-preloading-merge_request_diff.yml | 4 |
2 files changed, 5 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 diff --git a/changelogs/unreleased/fix-preloading-merge_request_diff.yml b/changelogs/unreleased/fix-preloading-merge_request_diff.yml new file mode 100644 index 00000000000..d38b6b0a707 --- /dev/null +++ b/changelogs/unreleased/fix-preloading-merge_request_diff.yml @@ -0,0 +1,4 @@ +--- +title: Fix bad query for PostgreSQL showing merge requests list +merge_request: 10666 +author: |