diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-04 16:30:40 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-07-04 16:30:40 +0000 |
| commit | eaa6edbff3dd6bc888d975bb1eb9b52f045930fa (patch) | |
| tree | b5cdf896d5486974a9435516cd735e6ee038e8f4 /app/controllers | |
| parent | dece84065f9dee04661e54af4f7016e7c50b63a6 (diff) | |
| parent | 381468d0cc6e5b528a4b2207c0a534569035a73f (diff) | |
| download | gitlab-ce-eaa6edbff3dd6bc888d975bb1eb9b52f045930fa.tar.gz | |
Merge branch '54117-transactional-rebase' into 'master'
Allow asynchronous rebase operations to be monitored
Closes #54117
See merge request gitlab-org/gitlab-ce!29940
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 |