diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 21:08:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 21:08:24 +0000 |
| commit | 727b1a890c8e44440414c59611e9ead34d6edc93 (patch) | |
| tree | de5f272452d2ee4d3e2edb90936fe7ecca127431 /app/workers/rebase_worker.rb | |
| parent | aa0f0e992153e84e1cdec8a1c7310d5eb93a9f8f (diff) | |
| download | gitlab-ce-727b1a890c8e44440414c59611e9ead34d6edc93.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/rebase_worker.rb')
| -rw-r--r-- | app/workers/rebase_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/rebase_worker.rb b/app/workers/rebase_worker.rb index 7343226fdcd..fd182125c07 100644 --- a/app/workers/rebase_worker.rb +++ b/app/workers/rebase_worker.rb @@ -7,12 +7,12 @@ class RebaseWorker feature_category :source_code_management - def perform(merge_request_id, current_user_id) + def perform(merge_request_id, current_user_id, skip_ci = false) 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) + .execute(merge_request, skip_ci: skip_ci) end end |