kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove allow_n_plus_1_calls from MergeRequests::CreateService

Browse source 
Fixes #37439
Fixes gitaly#1000
This commit is contained in:
Ahmad Sherif 2018-02-07 12:04:49 +01:00
parent 48568a9de0
commit 457e702b13
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/services/merge_requests/create_service.rb
View file

@ -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)