diff options
Diffstat (limited to 'routers/web/repo')
| -rw-r--r-- | routers/web/repo/branch.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/download.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/editor_test.go | 4 | ||||
| -rw-r--r-- | routers/web/repo/projects.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/view.go | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 84970a96a1..d14ba6cbe9 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -80,7 +80,7 @@ func Branches(ctx *context.Context) { } ctx.Data["Branches"] = branches ctx.Data["DefaultBranchBranch"] = defaultBranchBranch - pager := context.NewPagination(int(branchesCount), setting.Git.BranchesRangeSize, page, 5) + pager := context.NewPagination(branchesCount, setting.Git.BranchesRangeSize, page, 5) pager.SetDefaultParams(ctx) ctx.Data["Page"] = pager diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go index 2a83bafa85..6755cda874 100644 --- a/routers/web/repo/download.go +++ b/routers/web/repo/download.go @@ -116,7 +116,7 @@ func getBlobForEntry(ctx *context.Context) (blob *git.Blob, lastModified time.Ti } blob = entry.Blob() - return + return blob, lastModified } // SingleDownload download a file by repos path diff --git a/routers/web/repo/editor_test.go b/routers/web/repo/editor_test.go index 2bebb6fd52..ac0c385897 100644 --- a/routers/web/repo/editor_test.go +++ b/routers/web/repo/editor_test.go @@ -70,9 +70,7 @@ func TestGetClosestParentWithFiles(t *testing.T) { gitRepo, _ := git.OpenRepository(git.DefaultContext, repo.RepoPath()) defer gitRepo.Close() commit, _ := gitRepo.GetBranchCommit(branch) - expectedTreePath := "" - - expectedTreePath = "" // Should return the root dir, empty string, since there are no subdirs in this repo + var expectedTreePath string // Should return the root dir, empty string, since there are no subdirs in this repo for _, deletedFile := range []string{ "dir1/dir2/dir3/file.txt", "file.txt", diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 51c891dbf0..0aa9b5effc 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -105,7 +105,7 @@ func Projects(ctx *context.Context) { numPages := 0 if count > 0 { - numPages = int((int(count) - 1) / setting.UI.IssuePagingNum) + numPages = (int(count) - 1/setting.UI.IssuePagingNum) } pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, numPages) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index c327f959f6..17169699df 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -353,7 +353,7 @@ func renderReadmeFile(ctx *context.Context, readmeFile *namedBlob, readmeTreelin if markupType := markup.Type(readmeFile.name); markupType != "" { ctx.Data["IsMarkup"] = true - ctx.Data["MarkupType"] = string(markupType) + ctx.Data["MarkupType"] = markupType var result strings.Builder err := markup.Render(&markup.RenderContext{ Ctx: ctx, |