MBS-2349: Allow merging RGs when merging releases #2804
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implement MBS-2349
Problem
We used to have a checkbox before NGS came which allowed editors to enter a merge for the associated release groups when merging releases, and I still don't know why it was removed. I think it's because ocharles thought it was better to just let orphaned RGs get autoremoved, but that goes against the whole merge rather than delete ethos.
Readding the checkbox would allow editors to stop leaving orphaned RGs behind, without them having to go merge them by hand separately (which is enough effort to often think "you know what, whatever, they'll be garbage-collected anyway").
Solution
This (re-)adds a checkbox "Also merge the associated release groups" when merging releases. If selected, a second "Merge release groups" edit will be entered when submitting the "Merge releases edit" (under the original editor's account since it's entered by their choice). Both edits are linked to each other by ModBot edit notes.
Testing
So far I've tested this manually and it does what we expect it to, so putting it up to see if the idea seems sensible to others.
Actions