You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
zeripath 4a23212102
Do DB update after merge in hammer context (#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>

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2 years ago
..
check.go Fix checks in PR for empty commits #19603 (#20290) 2 years ago
check_test.go Refactor AssertExistsAndLoadBean to use generics (#20797) 2 years ago
commit_status.go Move issues related files into models/issues (#19931) 2 years ago
edits.go Move issues related files into models/issues (#19931) 2 years ago
lfs.go Move issues related files into models/issues (#19931) 2 years ago
main_test.go Use a struct as test options (#19393) 2 years ago
merge.go Do DB update after merge in hammer context (#21401) 2 years ago
patch.go Ensure that all unmerged files are merged when conflict checking (#20528) 2 years ago
patch_unmerged.go Ensure that all unmerged files are merged when conflict checking (#20528) 2 years ago
pull.go Move issues related files into models/issues (#19931) 2 years ago
pull_test.go Refactor AssertExistsAndLoadBean to use generics (#20797) 2 years ago
review.go Dismiss prior pull reviews if done via web in review dismiss (#20197) 2 years ago
temp_repo.go Move issues related files into models/issues (#19931) 2 years ago
update.go Prevent 500 is head repo does not have PullRequest unit in IsUserAllowedToUpdate (#20839) 2 years ago