Do DB update after merge in hammer context (#21401) #21416
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
Backport go-gitea#21401 When merge was changed to run in the background context, the db updates were still running in request context. This means that the merge could be successful but the db not be updated. This PR changes both these to run in the hammer context, this is not complete rollback protection but it's much better. Fix go-gitea#21332 Signed-off-by: Andrew Thornton <art27@cantab.net>
wxiaoguang
approved these changes
Oct 12, 2022
GiteaBot
added
the
lgtm/need 1
silverwind
approved these changes
Oct 12, 2022
GiteaBot
added
lgtm/done
wxiaoguang
approved these changes
Oct 12, 2022
tyroneyeh
pushed a commit
to tyroneyeh/gitea
that referenced
this pull request
Oct 24, 2022
…#21416) Backport go-gitea#21401 When merge was changed to run in the background context, the db updates were still running in request context. This means that the merge could be successful but the db not be updated. This PR changes both these to run in the hammer context, this is not complete rollback protection but it's much better. Fix go-gitea#21332 Signed-off-by: Andrew Thornton <art27@cantab.net>
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.
Backport #21401
When merge was changed to run in the background context, the db updates were still running in request context. This means that the merge could be successful but the db not be updated.
This PR changes both these to run in the hammer context, this is not complete rollback protection but it's much better.
Fix #21332
Signed-off-by: Andrew Thornton art27@cantab.net