diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-11 00:01:01 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-28 21:48:09 +0300 |
| commit | 4f17c6b7633c65a9d51dbcd9193914013707e226 (patch) | |
| tree | 8c4523f15e7b40a9b7852cc5413669144370f263 /app/services/merge_requests/update_service.rb | |
| parent | d7f61bae8b498a09180bb7e782a687ae2d0c3bae (diff) | |
Track enqueued and ongoing MRs
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 75a65aecd1a..6563a4101a3 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -83,7 +83,7 @@ module MergeRequests if merge_request.head_pipeline && merge_request.head_pipeline.active? MergeRequests::MergeWhenPipelineSucceedsService.new(project, current_user).execute(merge_request) else - MergeWorker.perform_async(merge_request.id, current_user.id, {}) + merge_request.async_merge(current_user.id, {}) end end |