summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-06-07 00:44:58 +0100
committerGitHub <noreply@github.com>2021-06-06 19:44:58 -0400
commit51775f65bc933843199320b040186703a2bb9f51 (patch)
tree103463ed6f5ab76245c3dcbaa46773b3bf358e6b /routers
parentb6762e23060972f0ad35aeab48850064687ea400 (diff)
downloadgitea-51775f65bc933843199320b040186703a2bb9f51.tar.gz
gitea-51775f65bc933843199320b040186703a2bb9f51.zip
Make commit info cancelable (#16032)
* 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> * pass context into get-last-commit Signed-off-by: Andrew Thornton <art27@cantab.net> * Make commit_info cancellable Signed-off-by: Andrew Thornton <art27@cantab.net> * use context as context Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/commit.go2
-rw-r--r--routers/repo/view.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index c471952637..3e6148bcbb 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -355,7 +355,7 @@ func Diff(ctx *context.Context) {
}
note := &git.Note{}
- err = git.GetNote(ctx.Repo.GitRepo, commitID, note)
+ err = git.GetNote(ctx, ctx.Repo.GitRepo, commitID, note)
if err == nil {
ctx.Data["Note"] = string(charset.ToUTF8WithFallback(note.Message))
ctx.Data["NoteCommit"] = note.Commit
diff --git a/routers/repo/view.go b/routers/repo/view.go
index 30d7de4078..cd5b0f43ed 100644
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -146,7 +146,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
}
var latestCommit *git.Commit
- ctx.Data["Files"], latestCommit, err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath, c)
+ ctx.Data["Files"], latestCommit, err = entries.GetCommitsInfo(ctx, ctx.Repo.Commit, ctx.Repo.TreePath, c)
if err != nil {
ctx.ServerError("GetCommitsInfo", err)
return