summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb7
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