]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d745780) | patch
Do DB update after merge in hammer context (#21401) (#21416)
authorzeripath <art27@cantab.net>
Wed, 12 Oct 2022 07:52:21 +0000 (08:52 +0100)
committerGitHub <noreply@github.com>
Wed, 12 Oct 2022 07:52:21 +0000 (15:52 +0800)
commit6afbef5a8b5bdc628d1a7c5e714dd9f5e9b911c8
tree215a2c474a2421085480d0a273e8d4bc2fa30142tree | snapshot
parentd74578001491e70d5db19270a442ece3f2a758aacommit | diff
Do DB update after merge in hammer context (#21401) (#21416)

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>
services/pull/merge.go diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea