From e2e11a05afd260f136ced4811d467f8f5935e928 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Wed, 7 Feb 2018 12:04:49 +0100 Subject: WIP --- app/services/merge_requests/create_service.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 634bf3bd690..46dc59bcec3 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -1,6 +1,7 @@ module MergeRequests class CreateService < MergeRequests::BaseService def execute + RequestStore.begin! set_projects! merge_request = MergeRequest.new @@ -9,10 +10,10 @@ 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 + a = create(merge_request) + RequestStore.end! + RequestStore.clear! + a end def before_create(merge_request) -- cgit v1.2.1