Merge branch 'master' into add-api-issues-subscriptions

Author: 6543

routers/repo/view.go

@@ -307,6 +307,11 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			var output bytes.Buffer
 			lines := strings.Split(fileContent, "\n")
 			ctx.Data["NumLines"] = len(lines)
+			if len(lines) == 1 && lines[0] == "" {
+				// If the file is completely empty, we show zero lines at the line counter
+				ctx.Data["NumLines"] = 0
+			}
+			ctx.Data["NumLinesSet"] = true
 
 			//Remove blank line at the end of file
 			if len(lines) > 0 && lines[len(lines)-1] == "" {

templates/repo/view_file.tmpl

@@ -6,7 +6,7 @@
 				<strong>{{.FileName}}</strong>
 			{{else}}
 				<div class="file-info text grey normal mono">
-					{{if .NumLines}}
+					{{if .NumLinesSet}}
 						<div class="file-info-entry">
 							{{.NumLines}} {{.i18n.Tr (TrN .i18n.Lang .NumLines "repo.line" "repo.lines") }}
 						</div>