diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 20:04:33 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-05 20:04:33 +0100 |
| commit | b058af1be6aad166fbab2809bb8430bc90b4896f (patch) | |
| tree | 6266e653a231e19a966693a7c1da7e07f6019978 /app/workers | |
| parent | 12984a73029408ef4ca10446131613e9ac371eb9 (diff) | |
| parent | 3d162d192ba2a57776de62b553a2a0a9a9245f8a (diff) | |
| download | gitlab-ce-b058af1be6aad166fbab2809bb8430bc90b4896f.tar.gz | |
Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/all_queues.yml | 1 | ||||
| -rw-r--r-- | app/workers/rebase_worker.rb | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 5da0de89d12..50e876b1d19 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -90,6 +90,7 @@ - project_service - propagate_service_template - reactive_caching +- rebase - repository_fork - repository_import - storage_migrator diff --git a/app/workers/rebase_worker.rb b/app/workers/rebase_worker.rb new file mode 100644 index 00000000000..090987778a2 --- /dev/null +++ b/app/workers/rebase_worker.rb @@ -0,0 +1,12 @@ +class RebaseWorker + include ApplicationWorker + + def perform(merge_request_id, current_user_id) + current_user = User.find(current_user_id) + merge_request = MergeRequest.find(merge_request_id) + + MergeRequests::RebaseService + .new(merge_request.source_project, current_user) + .execute(merge_request) + end +end |