8042/hotfix/false success on author merge#8735
Merged
jimchamp merged 5 commits intoFeb 21, 2024
Merged
Conversation
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #8735 +/- ##
==========================================
- Coverage 16.62% 16.61% -0.02%
==========================================
Files 88 88
Lines 4698 4701 +3
Branches 837 837
==========================================
Hits 781 781
- Misses 3399 3402 +3
Partials 518 518 ☔ View full report in Codecov by Sentry. |
jimchamp
approved these changes
Feb 21, 2024
jimchamp
left a comment
Collaborator
There was a problem hiding this comment.
Thanks, @benbdeitch, and sorry for the delay.
This seems to be working. I'm going to remove that confusing comment and merge this.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Closes #8042
Hotfix, so that unsuccessful merges don't display as successful.
Technical
The Ajax request for merges was set to always load in the 'successful merge element' on completion, regardless of whether or not the merge was successful. It has been split into a 'success' function and an 'error' function respectively.
Testing
Simply attempt an impossible merge, and an error message should show up.
Screenshot
Stakeholders
@cdrini