diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 12:09:27 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 12:09:27 +0000 |
| commit | 011ddb51b40897bc13a75d78c9e992f559cbde48 (patch) | |
| tree | d2f25aa76ab1466ecca82d2cf07e3594b8d7addc /app/controllers/root_controller.rb | |
| parent | a75cce1febf0403d66631841fff3bfbeefbfe6e3 (diff) | |
| parent | eb421c88ee2a57a437b9b14ba7447a04720354ac (diff) | |
| download | gitlab-ce-011ddb51b40897bc13a75d78c9e992f559cbde48.tar.gz | |
Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/controllers/root_controller.rb')
| -rw-r--r-- | app/controllers/root_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index 63e5fdb1da5..8acefd58e77 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -13,7 +13,10 @@ class RootController < Dashboard::ProjectsController before_action :redirect_logged_user, if: -> { current_user.present? } def index - super + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37434 + Gitlab::GitalyClient.allow_n_plus_1_calls do + super + end end private |