diff options
| author | David Svantesson <davidsvantesson@gmail.com> | 2020-01-11 08:29:34 +0100 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2020-01-11 02:29:34 -0500 |
| commit | 32fb813133c74ddc3af1964e81fff72fea4f24f1 (patch) | |
| tree | 31eec446f12e448d7cf398db43620606e9704ff1 /options/locale/locale_en-US.ini | |
| parent | 4d06d10dbafe7cfd404889b636d8e243058ee96f (diff) | |
| download | gitea-32fb813133c74ddc3af1964e81fff72fea4f24f1.tar.gz gitea-32fb813133c74ddc3af1964e81fff72fea4f24f1.zip | |
Allow repo admin to merge PR regardless of review status (#9611)
* Allow repo admin to merge even if review is not ok.
Diffstat (limited to 'options/locale/locale_en-US.ini')
| -rw-r--r-- | options/locale/locale_en-US.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a00df07d93..4dc0b92234 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1062,7 +1062,8 @@ pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled. pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually. pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress. -pulls.no_merge_status_check = This pull request cannot be merged because not all required status checkes are successful. +pulls.no_merge_not_ready = This pull request is not ready to be merged, check review status and status checks. +pulls.no_merge_access = You are not authorized to merge this pull request. pulls.merge_pull_request = Merge Pull Request pulls.rebase_merge_pull_request = Rebase and Merge pulls.rebase_merge_commit_pull_request = Rebase and Merge (--no-ff) |