diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2018-02-07 19:18:16 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2018-02-07 19:18:16 +0100 |
| commit | ca540d528b440b79b9e117ff11d1f2854ecb34a7 (patch) | |
| tree | 266dbe3cbad53fa32ea7761ff941e09f9f7127b5 | |
| parent | 826105dfda91081e92dfd5ca7f85a1343893e049 (diff) | |
| download | gitlab-ce-fix/create-mr-diffs-n-plus-1.tar.gz | |
| -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 d025062f562..81bdbe0f845 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -512,10 +512,13 @@ class MergeRequest < ActiveRecord::Base fetch_ref! # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435 - Gitlab::GitalyClient.allow_n_plus_1_calls do + # Gitlab::GitalyClient.allow_n_plus_1_calls do + RequestStore.begin! merge_request_diffs.create reload_merge_request_diff - end + RequestStore.end! + RequestStore.clear! + # end end def reload_merge_request_diff |