From 1710f3b7a8274e797baeff04102a4e4b55e83b6f Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Wed, 7 Feb 2018 20:58:55 +0100 Subject: Remove allow_n_plus_1 from MergeRequest#create_merge_request_diff Fixes #37435 Fixes gitaly#997 --- app/models/merge_request.rb | 8 ++------ 1 file 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 -- cgit v1.2.1