diff options
| author | KN4CK3R <admin@oldschoolhack.me> | 2022-03-22 08:03:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 08:03:22 +0100 |
| commit | 80fd25524e13dedbdc3527b32d008de152213a89 (patch) | |
| tree | 63b2bfe4ffaf1dce12080cabdc2e845c8731a673 /routers/web/repo/cherry_pick.go | |
| parent | [docs] Enhance container selection in docker dump (#14292) (diff) | |
| download | forgejo-80fd25524e13dedbdc3527b32d008de152213a89.tar.xz forgejo-80fd25524e13dedbdc3527b32d008de152213a89.zip | |
Renamed ctx.User to ctx.Doer. (#19161)
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'routers/web/repo/cherry_pick.go')
| -rw-r--r-- | routers/web/repo/cherry_pick.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/web/repo/cherry_pick.go b/routers/web/repo/cherry_pick.go index eb22809348..926361ccd7 100644 --- a/routers/web/repo/cherry_pick.go +++ b/routers/web/repo/cherry_pick.go @@ -127,7 +127,7 @@ func CherryPickPost(ctx *context.Context) { // First lets try the simple plain read-tree -m approach opts.Content = sha - if _, err := files.CherryPick(ctx, ctx.Repo.Repository, ctx.User, form.Revert, opts); err != nil { + if _, err := files.CherryPick(ctx, ctx.Repo.Repository, ctx.Doer, form.Revert, opts); err != nil { if models.IsErrBranchAlreadyExists(err) { // User has specified a branch that already exists branchErr := err.(models.ErrBranchAlreadyExists) @@ -164,7 +164,7 @@ func CherryPickPost(ctx *context.Context) { opts.Content = buf.String() ctx.Data["FileContent"] = opts.Content - if _, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.User, opts); err != nil { + if _, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, opts); err != nil { if models.IsErrBranchAlreadyExists(err) { // User has specified a branch that already exists branchErr := err.(models.ErrBranchAlreadyExists) |