summaryrefslogtreecommitdiffstats
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2020-09-11 22:14:48 +0800
committerGitHub <noreply@github.com>2020-09-11 10:14:48 -0400
commitdd1a651b5895cfdb8a141a56aa824ed4d082c41a (patch)
treec9d8f9adb0c0a9fb9af8623f1590275a395fa1c7 /routers/repo/pull.go
parent910947fbcd229abac9f507e266f94cb8864474cb (diff)
downloadgitea-dd1a651b5895cfdb8a141a56aa824ed4d082c41a.tar.gz
gitea-dd1a651b5895cfdb8a141a56aa824ed4d082c41a.zip
Move all push update operations to a queue (#10133)
* Fix test * Add no queue for test only * improve code * Auto watch whatever branch operation * Fix lint * Rename noqueue to immediate * Remove old PushUpdate function * Fix tests Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index a19dbb5cb3..a6f7a70744 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -22,7 +22,6 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
- "code.gitea.io/gitea/modules/repofiles"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
@@ -1124,10 +1123,8 @@ func CleanUpPullRequest(ctx *context.Context) {
return
}
- if err := repofiles.PushUpdate(
- pr.HeadRepo,
- pr.HeadBranch,
- repofiles.PushUpdateOptions{
+ if err := repo_service.PushUpdate(
+ &repo_service.PushUpdateOptions{
RefFullName: git.BranchPrefix + pr.HeadBranch,
OldCommitID: branchCommitID,
NewCommitID: git.EmptySHA,