Let CI catch N + 1 calls

5dd8c05a · Zeger-Jan van de Weg · 826105df · 5dd8c05a
Unverified Commit 5dd8c05a authored Feb 07, 2018 by Zeger-Jan van de Weg
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

merge_requests_controller.rb app/controllers/projects/merge_requests_controller.rb +1 -4

No files found.
--- 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