gitea

Commit Graph

Author	SHA1	Message	Date
Lunny Xiao	39d51e7c82	Automerge supports deleting branch automatically after merging (#32343 ) Resolve #32341 ~Depends on #27151~ - [x] It will display a checkbox of deleting the head branch on the pull request view page when starting an auto-merge task. - [x] Add permission check before deleting the branch - [x] Add delete branch comment for those closing pull requests because of head branch or base branch was deleted. - [x] Merge `RetargetChildrenOnMerge` and `AddDeletePRBranchComment` into `service.DeleteBranch`.	2 months ago
TheFox0x7	33e8e82c4b	Enable tenv and testifylint rules (#32852 ) Enables tenv and testifylint linters closes: https://github.com/go-gitea/gitea/issues/32842	2 months ago
Lunny Xiao	ebf0c96940	Move database operations of merging a pull request to post receive hook and add a transaction (#30805 ) Merging PR may fail because of various problems. The pull request may have a dirty state because there is no transaction when merging a pull request. ref https://github.com/go-gitea/gitea/pull/25741#issuecomment-2074126393 This PR moves all database update operations to post-receive handler for merging a pull request and having a database transaction. That means if database operations fail, then the git merging will fail, the git client will get a fail result. There are already many tests for pull request merging, so we don't need to add a new one. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	10 months ago

Author

SHA1

Message

Date

Lunny Xiao

39d51e7c82

Automerge supports deleting branch automatically after merging (#32343 )

Resolve #32341 
~Depends on #27151~

- [x] It will display a checkbox of deleting the head branch on the pull
request view page when starting an auto-merge task.
- [x] Add permission check before deleting the branch
- [x] Add delete branch comment for those closing pull requests because
of head branch or base branch was deleted.
- [x] Merge `RetargetChildrenOnMerge` and `AddDeletePRBranchComment`
into `service.DeleteBranch`.

TheFox0x7

33e8e82c4b

Enable tenv and testifylint rules (#32852 )

Enables tenv and testifylint linters
closes: https://github.com/go-gitea/gitea/issues/32842

Lunny Xiao

ebf0c96940

Move database operations of merging a pull request to post receive hook and add a transaction (#30805 )

Merging PR may fail because of various problems. The pull request may
have a dirty state because there is no transaction when merging a pull
request. ref
https://github.com/go-gitea/gitea/pull/25741#issuecomment-2074126393

This PR moves all database update operations to post-receive handler for
merging a pull request and having a database transaction. That means if
database operations fail, then the git merging will fail, the git client
will get a fail result.

There are already many tests for pull request merging, so we don't need
to add a new one.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

3 Commits (21af8150b7ba315a9f75264ab77813b0b7c697a8)