blob: 792f1728b88795225396704221654b1dea0a50db (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
# frozen_string_literal: true
module MergeRequests
class RebaseService < MergeRequests::BaseService
REBASE_ERROR = 'Rebase failed: Rebase locally, resolve all conflicts, then push the branch.'
attr_reader :merge_request, :rebase_error
def validate(merge_request)
return error_response(_('Source branch does not exist')) unless
merge_request.source_branch_exists?
return error_response(_('Cannot push to source branch')) unless
user_access.can_push_to_branch?(merge_request.source_branch)
return error_response(_('Source branch is protected from force push')) unless
merge_request.permits_force_push?
ServiceResponse.success
end
def execute(merge_request, skip_ci: false)
@merge_request = merge_request
@skip_ci = skip_ci
if rebase
success
else
error(rebase_error)
end
end
def rebase
repository.rebase(current_user, merge_request, skip_ci: @skip_ci)
true
rescue StandardError => e
set_rebase_error(e)
log_error(exception: e, message: rebase_error, save_message_on_model: true)
false
ensure
merge_request.update_column(:rebase_jid, nil)
end
private
def set_rebase_error(exception)
@rebase_error =
if exception.is_a?(Gitlab::Git::PreReceiveError)
"The rebase pre-receive hook failed: #{exception.message}."
else
REBASE_ERROR
end
end
def user_access
Gitlab::UserAccess.new(current_user, container: project)
end
def error_response(message)
ServiceResponse.error(message: message)
end
end
end
|
