From 5dd8c05a537bc8961b9a3089e11e21e1bb74a123 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Wed, 7 Feb 2018 11:29:01 +0100 Subject: Let CI catch N + 1 calls --- app/controllers/projects/merge_requests_controller.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'app/controllers/projects/merge_requests_controller.rb') 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 -- cgit v1.2.1