mirror of
https://github.com/go-gitea/gitea
synced 2025-07-23 10:48:37 +00:00
lint
This commit is contained in:
@@ -297,10 +297,10 @@ func manuallyMerged(ctx context.Context, pr *issues_model.PullRequest) bool {
|
|||||||
return false
|
return false
|
||||||
} else if !merged {
|
} else if !merged {
|
||||||
return false
|
return false
|
||||||
} else {
|
}
|
||||||
if err = issue_service.ChangeStatus(ctx, pr.Issue, pr.Merger, pr.MergedCommitID, true, true); err != nil {
|
|
||||||
log.Error("ChangeStatus %-v: %v", pr, err)
|
if err = issue_service.ChangeStatus(ctx, pr.Issue, pr.Merger, pr.MergedCommitID, true, true); err != nil {
|
||||||
}
|
log.Error("ChangeStatus %-v: %v", pr, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
notify_service.MergePullRequest(ctx, merger, pr)
|
notify_service.MergePullRequest(ctx, merger, pr)
|
||||||
|
Reference in New Issue
Block a user