-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Handle push rejection message in Merge & Web Editor #10373
Handle push rejection message in Merge & Web Editor #10373
Conversation
Codecov Report
@@ Coverage Diff @@
## master #10373 +/- ##
==========================================
- Coverage 43.68% 43.68% -0.01%
==========================================
Files 586 586
Lines 81199 81199
==========================================
- Hits 35475 35471 -4
- Misses 41333 41337 +4
Partials 4391 4391
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a nit, if you want...
Because this PR fixes the sanitization of the error message in the Web editor I've marked this as backport/v1.11 |
pleace send backport |
* 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 * Fixed conflicts in: modules/repofiles/temp_repo.go Co-authored-by: Lauris BH <lauris@nix.lv>
Backport go-gitea#10373 * Handle push rejection message in Merge * Fix sanitize, adjust message handling * Handle push-rejection in webeditor CRUD too Co-authored-by: Lauris BH <lauris@nix.lv>
Backport #10373 * Handle push rejection message in Merge * Fix sanitize, adjust message handling * Handle push-rejection in webeditor CRUD too Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lauris BH <lauris@nix.lv>
Merge push rejection due to pre-receive hook failure should not necessarily result in 500.
Fix: #10322