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/controllers/projects/merge_requests_controller.rb | |
| parent | d7f61bae8b498a09180bb7e782a687ae2d0c3bae (diff) | |
Track enqueued and ongoing MRs
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 2a3b73577a5..6f3dcc1d6fa 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -318,14 +318,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo elsif @merge_request.head_pipeline.success? # This can be triggered when a user clicks the auto merge button while # the tests finish at about the same time - MergeWorker.perform_async(@merge_request.id, current_user.id, params) + @merge_request.async_merge(current_user.id, params) :success else :failed end else - MergeWorker.perform_async(@merge_request.id, current_user.id, params) + @merge_request.async_merge(current_user.id, params) :success end |