8042/hotfix/false success on author merge #8735
Merged
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