Preserve mrid when deprecated keys are passed in merge_authors #10237
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jimchamp
approved these changes
Jan 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Addresses #10131
Part of the problem with completed author merges being stuck in the merge queue is that there's no way to remove these entries once they appear. I noticed that the problem entries were all using the deprecated /authors/merge?key=A001&key=A002&mrid=1 format.
The code in merge_authors that redirects to the preferred /authors/merge?records=A001,A002 doesn't preserve the mrid parameter, which takes the merge out of the merge queue context so that the Reject Merge button isn't available to close the request.
Technical
This change preserves the mrid parameter in the redirect and maintains the merge queue context.
Testing
With this change in place, review one of the stuck author merges in the queue. The Reject Merge button should now appear and allow you to close the request.
Stakeholders
@jimchamp