Fix merge dialog on protected branch with missing required statuses (#11074) #11084
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
…o-gitea#11074) It is possible for misconfigured protected branches to have required status checks that are not in any of the current statuses: Pending, Success, Error, Failure, or Warning - presumably because the CI has not contacted us as yet. Fix go-gitea#10636 by adding case: missing StatusChecks when these are missing
mrsdizzie
approved these changes
Apr 15, 2020
GiteaBot
added
the
lgtm/need 1
guillep2k
reviewed
Apr 16, 2020
| @@ -1062,6 +1062,7 @@ pulls.data_broken = This pull request is broken due to missing fork information. | |||
| pulls.files_conflicted = This pull request has changes conflicting with the target branch. | |||
| pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments." | |||
| pulls.required_status_check_failed = Some required checks were not successful. | |||
| pulls.required_status_check_missing = Some required checks are missing. | |||
There was a problem hiding this comment.
How will this work with Crowdin now?
There was a problem hiding this comment.
maybe should translate it manually ... :(
There was a problem hiding this comment.
it will work just fine, crowdin checks only master branch. In this case this text will be in English in all languages
lafriks
approved these changes
Apr 16, 2020
GiteaBot
added
lgtm/done
zeripath
changed the title
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport of #11074