diff options
| author | zeripath <art27@cantab.net> | 2020-02-22 13:08:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 15:08:48 +0200 |
| commit | 089ccb0c80050efc8c3afef2402ea4f4a5ed250e (patch) | |
| tree | 4ff172035ffd0a9a5263dedc051a91ab24c33fa6 /options/locale | |
| parent | 2ed9ead6dea29f9e006fa1831892c9c239f4bd70 (diff) | |
| download | gitea-089ccb0c80050efc8c3afef2402ea4f4a5ed250e.tar.gz gitea-089ccb0c80050efc8c3afef2402ea4f4a5ed250e.zip | |
Handle push rejection message in Merge & Web Editor (#10373)
* Handle push rejection message in Merge
* placate golangci-lint
* Fix sanitize, adjust message handling
* oops
* Oops
* Handle push-rejection in webeditor CRUD too
* Apply suggestions from code review
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'options/locale')
| -rw-r--r-- | options/locale/locale_en-US.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2ebedc57d1..7fe7bf697d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -784,6 +784,8 @@ editor.commit_empty_file_header = Commit an empty file editor.commit_empty_file_text = The file you're about commit is empty. Proceed? editor.no_changes_to_show = There are no changes to show. editor.fail_to_update_file = Failed to update/create file '%s' with error: %v +editor.push_rejected_no_message = The change was rejected by the server without a message. Please check githooks. +editor.push_rejected = The change was rejected by the server with the following message:<br>%s<br> Please check githooks. editor.add_subdir = Add a directory… editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v editor.upload_file_is_locked = File '%s' is locked by %s. @@ -1088,6 +1090,8 @@ pulls.merge_conflict = Merge Failed: There was a conflict whilst merging: %[1]s< pulls.rebase_conflict = Merge Failed: There was a conflict whilst rebasing commit: %[1]s<br>%[2]s<br>%[3]s<br>Hint:Try a different strategy pulls.unrelated_histories = Merge Failed: The merge head and base do not share a common history. Hint: Try a different strategy pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again. +pulls.push_rejected = Merge Failed: The push was rejected with the following message:<br>%s<br>Review the githooks for this repository +pulls.push_rejected_no_message = Merge Failed: The push was rejected but there was no remote message.<br>Review the githooks for this repository pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` pulls.status_checking = Some checks are pending pulls.status_checks_success = All checks were successful |