diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/private/hook.go | 2 | ||||
| -rw-r--r-- | routers/private/push_update.go | 2 | ||||
| -rw-r--r-- | routers/repo/branch.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/routers/private/hook.go b/routers/private/hook.go index 074e3aef19..c9065bceb3 100644 --- a/routers/private/hook.go +++ b/routers/private/hook.go @@ -159,7 +159,7 @@ func HookPostReceive(ctx *macaron.Context) { }) return } - if err := repofiles.PushUpdate(repo, branch, models.PushUpdateOptions{ + if err := repofiles.PushUpdate(repo, branch, repofiles.PushUpdateOptions{ RefFullName: refFullName, OldCommitID: oldCommitID, NewCommitID: newCommitID, diff --git a/routers/private/push_update.go b/routers/private/push_update.go index 42eda3178b..d8102cbfbe 100644 --- a/routers/private/push_update.go +++ b/routers/private/push_update.go @@ -18,7 +18,7 @@ import ( // PushUpdate update public key updates func PushUpdate(ctx *macaron.Context) { - var opt models.PushUpdateOptions + var opt repofiles.PushUpdateOptions if err := json.NewDecoder(ctx.Req.Request.Body).Decode(&opt); err != nil { ctx.JSON(500, map[string]interface{}{ "err": err.Error(), diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 0c06de3ea6..306deca36e 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -137,7 +137,7 @@ func deleteBranch(ctx *context.Context, branchName string) error { if err := repofiles.PushUpdate( ctx.Repo.Repository, branchName, - models.PushUpdateOptions{ + repofiles.PushUpdateOptions{ RefFullName: git.BranchPrefix + branchName, OldCommitID: commit.ID.String(), NewCommitID: git.EmptySHA, |