diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-09-19 10:55:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-19 10:55:37 +0000 |
| commit | 64d7ec0a9e3ffd6233ccfbe9100f8a9391c648e5 (patch) | |
| tree | 2cc89bc2d1087eb145918c6ae8cbf70878d40e97 /app/models/merge_request.rb | |
| parent | 39dd7736585d3e35d5c6f391e6a94c312da09056 (diff) | |
| download | gitlab-ce-64d7ec0a9e3ffd6233ccfbe9100f8a9391c648e5.tar.gz | |
Detect n+1 issues involving Gitaly
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 2a56bab48a3..31bd130dcc2 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -415,8 +415,11 @@ class MergeRequest < ActiveRecord::Base end def create_merge_request_diff - merge_request_diffs.create - reload_merge_request_diff + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435 + Gitlab::GitalyClient.allow_n_plus_1_calls do + merge_request_diffs.create + reload_merge_request_diff + end end def reload_merge_request_diff |