Merge branch 'lunny/db_in_transaction' of github.com:lunny/gitea into lunny/db_in_transaction

lunny · lunny · commit e1434d90a4fc · 2022-11-10T23:37:34.000+08:00
diff --git a/models/issues/pull.go b/models/issues/pull.go
@@ -498,7 +498,7 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) {
 
 // NewPullRequest creates new pull request with labels for repository.
 func NewPullRequest(outerCtx context.Context, repo *repo_model.Repository, issue *Issue, labelIDs []int64, uuids []string, pr *PullRequest) (err error) {
-	ctx, committer, err := db.TxContext(db.DefaultContext)
+	ctx, committer, err := db.TxContext(outerCtx)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) {`
`498`	`498`
`499`	`499`	`// NewPullRequest creates new pull request with labels for repository.`
`500`	`500`	`func NewPullRequest(outerCtx context.Context, repo repo_model.Repository, issue Issue, labelIDs []int64, uuids []string, pr *PullRequest) (err error) {`
`501`		`- ctx, committer, err := db.TxContext(db.DefaultContext)`
	`501`	`+ ctx, committer, err := db.TxContext(outerCtx)`
`502`	`502`	`if err != nil {`
`503`	`503`	`return err`
`504`	`504`	`}`