diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2018-02-07 12:04:49 +0100 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2018-02-07 15:08:18 +0100 |
| commit | 457e702b13f31cd967adf8c555a79fd96b9bf9e3 (patch) | |
| tree | 51cc87ea1d650fef108d0fc25f411ecb40bc95e4 | |
| parent | 48568a9de00443507aafe3020d2f00bd538d874e (diff) | |
| download | gitlab-ce-fix/reduce-number-of-ref-exists-calls.tar.gz | |
Remove allow_n_plus_1_calls from MergeRequests::CreateServicefix/reduce-number-of-ref-exists-calls
Fixes #37439
Fixes gitaly#1000
| -rw-r--r-- | app/services/merge_requests/create_service.rb | 5 |
1 files changed, 1 insertions, 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) |