diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-07 11:47:10 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-07 11:47:10 +0000 |
| commit | da0efda2ecb51c6358bf73bd85cef5a883be402e (patch) | |
| tree | c19bee992fdb9d4c7498fb8c93d8ee1dcb1da613 | |
| parent | 7a6e88263c922f44e498cd75edd3e4bb1f7469fc (diff) | |
| parent | 5dd8c05a537bc8961b9a3089e11e21e1bb74a123 (diff) | |
| download | gitlab-ce-da0efda2ecb51c6358bf73bd85cef5a883be402e.tar.gz | |
Merge branch 'zj-n-1-merge-requests-show' into 'master'
Remove N + 1 issue for MergeRequests#show
Closes #37432 and gitaly#994
See merge request gitlab-org/gitlab-ce!16967
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 8af4e379f0a..8eed957d9fe 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -50,10 +50,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo set_pipeline_variables - # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37432 - Gitlab::GitalyClient.allow_n_plus_1_calls do - render - end + render end format.json do |