From 457e702b13f31cd967adf8c555a79fd96b9bf9e3 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Wed, 7 Feb 2018 12:04:49 +0100 Subject: [PATCH] Remove allow_n_plus_1_calls from MergeRequests::CreateService Fixes #37439 Fixes gitaly#1000 --- app/services/merge_requests/create_service.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 634bf3bd690..a18b1c90765 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -9,10 +9,7 @@ module MergeRequests merge_request.source_branch = params[:source_branch] merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) - # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37439 - Gitlab::GitalyClient.allow_n_plus_1_calls do - create(merge_request) - end + create(merge_request) end def before_create(merge_request) -- GitLab