diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-02-07 11:29:01 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-02-07 11:29:01 +0100 |
| commit | 5dd8c05a537bc8961b9a3089e11e21e1bb74a123 (patch) | |
| tree | 62ec610fadf15aa1b7b0e8e6bdf7f2780739438e | |
| parent | 826105dfda91081e92dfd5ca7f85a1343893e049 (diff) | |
| download | gitlab-ce-zj-n-1-merge-requests-show.tar.gz | |
Let CI catch N + 1 callszj-n-1-merge-requests-show
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
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 |