Skip to content

Standardize merge details messaging

Amy Qualls requested to merge 343780-aqualls-adds-commit-string into master

What does this MR do and why?

The messages we show users in the merge request widgets have NEVER been parallel. They're also super wordy. Let's start by changing the wording over to present tense. It gets rid of the 'will be' construction.

  • Message 1:
    • OLD: The source branch will be deleted
    • NEW: Deletes the source branch
  • Message 2:
    • OLD: The source branch will not be deleted
    • NEW: Does not delete the source branch
  • Message 3:
    • OLD: The changes will be merged into [x]
    • NEW: Merges changes into [x]
  • Message 4:
    • OLD: %{commitCount} will be added to %{targetBranch}.
    • NEW: Adds %{commitCount} to %{targetBranch}.
  • Message 5, %{squashedCommits} - also used in message 6
    • OLD: (commits will be squashed)
    • NEW: (squashes %d commit) and (squashes %d commits)
  • Message 6:
    • OLD: %{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}%{squashedCommits}.
    • NEW: Adds %{commitCount} and %{mergeCommitCount} to %{targetBranch}%{squashedCommits}.

Closes #343780 (closed)

Screenshots or screen recordings

These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Amy Qualls

Merge request reports