debian-mirror-gitlab/app/services/merge_requests/rebase_service.rb

40 lines
921 B
Ruby
Raw Normal View History

2018-11-18 11:00:15 +05:30
# frozen_string_literal: true
2018-03-17 18:26:18 +05:30
module MergeRequests
2019-12-26 22:10:19 +05:30
class RebaseService < MergeRequests::BaseService
include Git::Logger
2019-12-04 20:38:33 +05:30
REBASE_ERROR = 'Rebase failed. Please rebase locally'
2018-03-17 18:26:18 +05:30
2019-12-26 22:10:19 +05:30
attr_reader :merge_request
2018-03-17 18:26:18 +05:30
def execute(merge_request)
@merge_request = merge_request
if rebase
success
else
error(REBASE_ERROR)
end
end
def rebase
2019-10-12 21:52:04 +05:30
# Ensure Gitaly isn't already running a rebase
if source_project.repository.rebase_in_progress?(merge_request.id)
2018-03-17 18:26:18 +05:30
log_error('Rebase task canceled: Another rebase is already in progress', save_message_on_model: true)
return false
end
2019-07-31 22:56:46 +05:30
repository.rebase(current_user, merge_request)
2018-11-08 19:23:39 +05:30
2018-03-17 18:26:18 +05:30
true
rescue => e
log_error(REBASE_ERROR, save_message_on_model: true)
log_error(e.message)
false
2019-09-30 21:07:59 +05:30
ensure
merge_request.update_column(:rebase_jid, nil)
2018-03-17 18:26:18 +05:30
end
end
end