summaryrefslogtreecommitdiffstats
path: root/routers/private
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-05-31 07:18:11 +0100
committerGitHub <noreply@github.com>2021-05-31 02:18:11 -0400
commit3183a465d71a13535e52589bb85b987176872fcd (patch)
tree03d1cb88627176f35e168cda5e46df197dcc3110 /routers/private
parent518ed504ef8714eeac126fc59ff57f50a98e3692 (diff)
downloadgitea-3183a465d71a13535e52589bb85b987176872fcd.tar.gz
gitea-3183a465d71a13535e52589bb85b987176872fcd.zip
Make modules/context.Context a context.Context (#16031)
* Make modules/context.Context a context.Context Signed-off-by: Andrew Thornton <art27@cantab.net> * Simplify context calls Signed-off-by: Andrew Thornton <art27@cantab.net> * Set the base context for requests to the HammerContext Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'routers/private')
-rw-r--r--routers/private/manager.go2
-rw-r--r--routers/private/restore_repo.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/routers/private/manager.go b/routers/private/manager.go
index 192c4947e7..1ccb184363 100644
--- a/routers/private/manager.go
+++ b/routers/private/manager.go
@@ -35,7 +35,7 @@ func FlushQueues(ctx *context.PrivateContext) {
})
return
}
- err := queue.GetManager().FlushAll(ctx.Req.Context(), opts.Timeout)
+ err := queue.GetManager().FlushAll(ctx, opts.Timeout)
if err != nil {
ctx.JSON(http.StatusRequestTimeout, map[string]interface{}{
"err": fmt.Sprintf("%v", err),
diff --git a/routers/private/restore_repo.go b/routers/private/restore_repo.go
index c002de874a..df787e1b33 100644
--- a/routers/private/restore_repo.go
+++ b/routers/private/restore_repo.go
@@ -36,7 +36,7 @@ func RestoreRepo(ctx *myCtx.PrivateContext) {
}
if err := migrations.RestoreRepository(
- ctx.Req.Context(),
+ ctx,
params.RepoDir,
params.OwnerName,
params.RepoName,