diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2018-02-07 20:58:55 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2018-02-07 20:58:55 +0100 |
| commit | 1710f3b7a8274e797baeff04102a4e4b55e83b6f (patch) | |
| tree | bb0db37c9fcdfeb1569d5be1edd733a273f3af87 | |
| parent | 714d8e95f6de31ed2686f1b2ca05cb5d1f68c878 (diff) | |
| download | gitlab-ce-remove-mr-diffs-n-plus-1.tar.gz | |
Remove allow_n_plus_1 from MergeRequest#create_merge_request_diffremove-mr-diffs-n-plus-1
Fixes #37435
Fixes gitaly#997
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d025062f562..8b285091eda 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -510,12 +510,8 @@ class MergeRequest < ActiveRecord::Base def create_merge_request_diff fetch_ref! - - # 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 + merge_request_diffs.create + reload_merge_request_diff end def reload_merge_request_diff |