diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-09-19 13:55:37 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-19 13:55:37 +0300 |
| commit | 64d7ec0a9e3ffd6233ccfbe9100f8a9391c648e5 (patch) | |
| tree | 2cc89bc2d1087eb145918c6ae8cbf70878d40e97 /app/controllers/projects/merge_requests | |
| parent | 39dd7736585d3e35d5c6f391e6a94c312da09056 (diff) | |
Detect n+1 issues involving Gitaly
Diffstat (limited to 'app/controllers/projects/merge_requests')
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index d60a24d3f1d..7d16e77ef66 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -10,7 +10,10 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic def show @environment = @merge_request.environments_for(current_user).last - render json: { html: view_to_html_string("projects/merge_requests/diffs/_diffs") } + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37431 + Gitlab::GitalyClient.allow_n_plus_1_calls do + render json: { html: view_to_html_string("projects/merge_requests/diffs/_diffs") } + end end def diff_for_path |