Skip to content
This repository was archived by the owner on Apr 30, 2025. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions process-merge-requests
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ def merge_git_proposal(branch_merge_proposal, user, credentials):
target_path = branch_merge_proposal.target_git_path
target_branch = target_path.split('/')[-1]
commit_message = 'Merge #{0} from {1}'.format(merge_id, source_identity)
commit_message += '\n\nMerge-Proposal:' + branch_merge_proposal.web_link
if branch_merge_proposal.commit_message is not None:
commit_message += '\n\n' + branch_merge_proposal.commit_message
_logger.info(_("Setting up git merge"))
Expand Down