381468d0cc
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.
34 lines
806 B
Ruby
34 lines
806 B
Ruby
# frozen_string_literal: true
|
|
|
|
module MergeRequests
|
|
class RebaseService < MergeRequests::WorkingCopyBaseService
|
|
REBASE_ERROR = 'Rebase failed. Please rebase locally'.freeze
|
|
|
|
def execute(merge_request)
|
|
@merge_request = merge_request
|
|
|
|
if rebase
|
|
success
|
|
else
|
|
error(REBASE_ERROR)
|
|
end
|
|
end
|
|
|
|
def rebase
|
|
if merge_request.gitaly_rebase_in_progress?
|
|
log_error('Rebase task canceled: Another rebase is already in progress', save_message_on_model: true)
|
|
return false
|
|
end
|
|
|
|
repository.rebase(current_user, merge_request)
|
|
|
|
true
|
|
rescue => e
|
|
log_error(REBASE_ERROR, save_message_on_model: true)
|
|
log_error(e.message)
|
|
false
|
|
ensure
|
|
merge_request.update_column(:rebase_jid, nil)
|
|
end
|
|
end
|
|
end
|