Commit da0efda2 authored by Sean McGivern's avatar Sean McGivern

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
parents 7a6e8826 5dd8c05a
Pipeline #17205088 passed with stages
in 45 minutes and 45 seconds
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment