Trigger merge request hook when source updated
This commit is contained in:
parent
c7db2661a5
commit
de7c3291e9
1 changed files with 9 additions and 3 deletions
|
@ -51,7 +51,7 @@ module MergeRequests
|
|||
|
||||
if merge_request.source_branch == @branch_name || force_push?
|
||||
merge_request.reload_code
|
||||
merge_request.mark_as_unchecked
|
||||
update_merge_request(merge_request)
|
||||
else
|
||||
mr_commit_ids = merge_request.commits.map(&:id)
|
||||
push_commit_ids = @commits.map(&:id)
|
||||
|
@ -59,14 +59,20 @@ module MergeRequests
|
|||
|
||||
if matches.any?
|
||||
merge_request.reload_code
|
||||
merge_request.mark_as_unchecked
|
||||
update_merge_request(merge_request)
|
||||
else
|
||||
merge_request.mark_as_unchecked
|
||||
update_merge_request(merge_request)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def update_merge_request(merge_request)
|
||||
MergeRequests::UpdateService.new(
|
||||
merge_request.target_project,
|
||||
@current_user, merge_status: 'unchecked').execute(merge_request)
|
||||
end
|
||||
|
||||
# Add comment about pushing new commits to merge requests
|
||||
def comment_mr_with_commits
|
||||
merge_requests = @project.origin_merge_requests.opened.where(source_branch: @branch_name).to_a
|
||||
|
|
Loading…
Reference in a new issue