mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-28 03:36:25 +00:00
wxiaoguang
ea91028028
* Revert the behavior introduced by #30805 * Now the PR status is still managed in Gitea's code where the operation is triggerred but not in post-receive hook * Fix #39254 and many more related bugs. * Fix #39124 ``` // MarkAsMerged sets a pull request to merged and closes the corresponding issue // To make sure the pull request is marked as merged correctly, the caller uses multiple-stage operations: // 1. Create a temp repo from base, merge the head into the temp repo, and get the merged commit ID and timestamp, // 2. The merged commit ID and related information are stored into pull request // 3. Push the merged commit to the base repo // 4. Call MarkAsMerged to mark the pull request as merged and do post-processing (notification, close issues, etc) // // If failure occurs in step 1/2/3: the pull request is still open, the base repo is not changed, the doer can start a new merge. // If failure occurs in step 4: the pull request can be marked as merged by the merged commit ID stored in it later. ```
29 lines
546 B
Go
29 lines
546 B
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package v28
|
|
|
|
import (
|
|
"context"
|
|
|
|
"gitea.dev/modelmigration/base"
|
|
|
|
"xorm.io/xorm"
|
|
)
|
|
|
|
type pullAutoMerge struct {
|
|
MergedCommitID string `xorm:"VARCHAR(64)"`
|
|
}
|
|
|
|
func (pullAutoMerge) TableName() string {
|
|
return "pull_auto_merge"
|
|
}
|
|
|
|
func AddAutoMergeMergedCommitID(_ context.Context, x base.EngineMigration) error {
|
|
_, err := x.SyncWithOptions(xorm.SyncOptions{
|
|
IgnoreConstrains: true,
|
|
IgnoreDropIndices: true,
|
|
}, new(pullAutoMerge))
|
|
return err
|
|
}
|