diff options
| author | 6543 <6543@obermui.de> | 2020-04-15 22:35:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 21:35:18 +0100 |
| commit | a88f3663eb162f2a2558c3a957087a680bdd8ce6 (patch) | |
| tree | fb0c113aa20c820578e2e28f86aaa716c040f913 /options | |
| parent | 8cdb6662c8154a840a1ba547599e2847a1b80d17 (diff) | |
| download | gitea-a88f3663eb162f2a2558c3a957087a680bdd8ce6.tar.gz gitea-a88f3663eb162f2a2558c3a957087a680bdd8ce6.zip | |
Fix merge dialog on protected branch with missing required statuses (#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 #10636 by adding case: missing StatusChecks when these are missing
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8b43115c07..cf1c547b03 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1098,6 +1098,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. pulls.required_status_check_administrator = As an administrator, you may still merge this pull request. pulls.blocked_by_approvals = "This Pull Request doesn't have enough approvals yet. %d of %d approvals granted." pulls.blocked_by_rejection = "This Pull Request has changes requested by an official reviewer." |