diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-28 11:13:06 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-28 11:13:06 +0300 |
| commit | cbdd24118ce3f3043fcde3544678c0838d03bbe4 (patch) | |
| tree | 1b9b16e39cbb2edfa06b81c0c218248130207f4b | |
| parent | b802e0bbbf7eab6635520c180eb5632ead61d043 (diff) | |
| parent | 7d3377bb83ad84b27ae486e502ad052562e3c96b (diff) | |
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
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index b1d224d026f..b044affd4e8 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -13,7 +13,13 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = load_projects(params.merge(non_public: true)) 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 load_events render layout: 'xml.atom' |