Fix showing success message if PR force-merge fails. #1016
Merged
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
|
Deploy preview for netlify-cms-www ready! Built with commit cda55bc |
|
Deploy preview for cms-demo ready! Built with commit cda55bc |
tech4him1
force-pushed
the
approval-required
branch
from
d031e2c to
cda55bc
Compare
tech4him1
changed the title
Benaiah
approved these changes
Jan 17, 2018
verythorough
approved these changes
Jan 17, 2018
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.
- Summary
This happens when a PR must be approved first, and the user does not have force-merge permissions to override the review requirement. Before, the CMS was simply deleting the branch/PR and reporting success, whereas it should report failure and leave the branch open until an admin can merge.
Fixes #1019.
- Test plan
Manually tested.
- Description for the changelog
Fix showing success message if PR force-merge fails.
- A picture of a cute animal (not mandatory but encouraged)
