zeripath 6afbef5a8b

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>

2022-10-12 15:52:21 +08:00

..

check_test.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

check.go

Fix checks in PR for empty commits (#20290) (#20352)

2022-07-13 18:36:23 +01:00

commit_status.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

edits.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

lfs.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

main_test.go

Use a struct as test options (#19393)

2022-04-14 21:58:21 +08:00

merge.go

Do DB update after merge in hammer context (#21401) (#21416)

2022-10-12 15:52:21 +08:00

patch_unmerged.go

Ensure that all unmerged files are merged when conflict checking (#20528) (#20536)

2022-07-29 15:37:18 +02:00

patch.go

Ensure that all unmerged files are merged when conflict checking (#20528) (#20536)

2022-07-29 15:37:18 +02:00

pull_test.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

pull.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

review.go

Dismiss prior pull reviews if done via web in review dismiss (#20197) (#20407)

2022-07-19 17:46:33 +02:00

temp_repo.go

Move issues related files into models/issues (#19931)

2022-06-13 17:37:59 +08:00

update.go

Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) (#20848)

2022-08-18 14:55:34 -04:00