Skip to content

Only send commit messages from the MR if they've been manually modified

Marc Shaw requested to merge only_send_commit_message_when_given into master

What does this MR do and why?

Reapply "Merge branch 'tor/defect/merge-commit-message' into 'master'"

!158881 (merged)

What does this MR do and why?

For #467506 (closed)

(See issue for overall problem)

Only sends any commit message from the front end if the message has been modified by the user.

This allows the back end to use the default - which can get updated after the message would have been sent.

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

N/A, all back stage.

How to set up and validate locally

Merge branch '%{source_branch}' into '%{target_branch}'

%{title}

%{issues}

See merge request %{reference}

%{approved_by}

Update
  1. Configure Merge commit message template as mentioned above.
  2. Set up a Push Rule - Update.+
  3. Create an MR with Update in the title.
  4. Click Set to auto-merge.
  5. Approve the MR.
  6. Repeat with manually set commit/squash commit messages (these SHOULD override the default, and not include approvers)

Repeat these steps, but select squash commits when clicking auto merge

Edited by Marc Shaw

Merge request reports