From ca540d528b440b79b9e117ff11d1f2854ecb34a7 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Wed, 7 Feb 2018 19:18:16 +0100 Subject: WIP --- app/models/merge_request.rb | 7 +++++-- 1 file 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 -- cgit v1.2.1