Commit cbdd2411 authored by Stan Hu's avatar Stan Hu

Merge branch 'root_controller_gitaly_allow_n_1' into 'master'

Allow Gitaly N+1 calls for RootController#index

See merge request gitlab-org/gitlab-ce!25514
parents b802e0bb 7d3377bb
...@@ -13,7 +13,13 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController ...@@ -13,7 +13,13 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = load_projects(params.merge(non_public: true)) @projects = load_projects(params.merge(non_public: true))
respond_to do |format| respond_to do |format|
format.html format.html do
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37434
# Also https://gitlab.com/gitlab-org/gitlab-ce/issues/40260
Gitlab::GitalyClient.allow_n_plus_1_calls do
render
end
end
format.atom do format.atom do
load_events load_events
render layout: 'xml.atom' render layout: 'xml.atom'
......
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