summaryrefslogtreecommitdiffstats
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2020-10-31 05:59:02 +0800
committerGitHub <noreply@github.com>2020-10-30 22:59:02 +0100
commit4df2ed29f28194513c59733e369152b8f8bc1d36 (patch)
tree3bb0604e902390f37e2c9a8104f4ccaf495b4291 /routers/repo/pull.go
parentdd12384f224e98a130511ebc9ffcfb44ead0e736 (diff)
downloadgitea-4df2ed29f28194513c59733e369152b8f8bc1d36.tar.gz
gitea-4df2ed29f28194513c59733e369152b8f8bc1d36.zip
Refactor: Move PushUpdateOptions (#13363)
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 1b3f835e4f..0ea6ec33de 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -22,6 +22,7 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification"
+ repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/upload"
@@ -1185,7 +1186,7 @@ func CleanUpPullRequest(ctx *context.Context) {
}
if err := repo_service.PushUpdate(
- &repo_service.PushUpdateOptions{
+ &repo_module.PushUpdateOptions{
RefFullName: git.BranchPrefix + pr.HeadBranch,
OldCommitID: branchCommitID,
NewCommitID: git.EmptySHA,