blob: 1a83bbf9de6e28b30d68ef147ec0ff93ba5da0f3 (
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
|
# frozen_string_literal: true
module MergeRequests
# MergeService class
#
# Do git fast-forward merge and in case of success
# mark merge request as merged and execute all hooks and notifications
# Executed when you do fast-forward merge via GitLab UI
#
class FfMergeService < MergeRequests::MergeService
extend ::Gitlab::Utils::Override
private
override :execute_git_merge
def execute_git_merge
repository.ff_merge(
current_user,
source,
merge_request.target_branch,
merge_request: merge_request
)
end
override :merge_success_data
def merge_success_data(commit_id)
# There is no merge commit to update, so this is just blank.
{}
end
end
end
|