diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-21 19:56:47 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-04 10:50:55 +0300 |
| commit | 381468d0cc6e5b528a4b2207c0a534569035a73f (patch) | |
| tree | 2ffc9e9062fef50a7cca8dfd8d0b5733e8cf4c9d /app/controllers | |
| parent | 9ef0c8559de925d0a72a3fe421d95209c2b81d8f (diff) | |
Allow asynchronous rebase operations to be monitored
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.
After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7ee8e0ea8f8..2aa2508be16 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -201,7 +201,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo end def rebase - RebaseWorker.perform_async(@merge_request.id, current_user.id) + @merge_request.rebase_async(current_user.id) head :ok end |