From 0d1e001b9cae08c2d5f0ffc0ef9fec0f92d1683e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 2 May 2017 16:57:54 +0800 Subject: fix multiple readme file rendering and fix #1657 (#1658) * fix multiple readme file rendering and fix #1657 * remove unnecessary loop --- routers/repo/view.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'routers') diff --git a/routers/repo/view.go b/routers/repo/view.go index 2e4b2644cd..165284a599 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -56,13 +56,19 @@ func renderDirectory(ctx *context.Context, treeLink string) { var readmeFile *git.Blob for _, entry := range entries { - if entry.IsDir() || !markup.IsReadmeFile(entry.Name()) { + if entry.IsDir() { + continue + } + + tp, ok := markup.ReadmeFileType(entry.Name()) + if !ok { continue } - // TODO: collect all possible README files and show with priority. readmeFile = entry.Blob() - break + if tp != "" { + break + } } if readmeFile != nil { -- cgit v1.2.3