Handle push rejection message in Merge & Web Editor #10373
Merged
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
zeripath
added
the
type/feature
guillep2k
reviewed
Feb 20, 2020
GiteaBot
added
the
lgtm/need 2
bagasme
reviewed
Feb 20, 2020
guillep2k
approved these changes
Feb 20, 2020
GiteaBot
added
lgtm/need 1
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.
|
zeripath
commented
Feb 21, 2020
zeripath
changed the title
|
Because this PR fixes the sanitization of the error message in the Web editor I've marked this as backport/v1.11 |
lafriks
approved these changes
Feb 22, 2020
GiteaBot
added
lgtm/done
|
pleace send backport |
guillep2k
pushed a commit
to guillep2k/gitea
that referenced
this pull request
Feb 27, 2020
* 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>
This was referenced Feb 27, 2020
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 27, 2020
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>
lafriks
added a commit
that referenced
this pull request
Feb 27, 2020
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>
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.
Merge push rejection due to pre-receive hook failure should not necessarily result in 500.
Fix: #10322