Merge branch 'master' of github.com:gogits/gogs

4 files changed, 17 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 55d2a578..6559d61a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@ gogs
 *.log
 custom/
 .vendor/
-repo/
diff --git a/routers/repo/single.go b/routers/repo/single.go
index f47a2f7b..cf64cc6b 100644
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -88,21 +88,16 @@ func Single(ctx *middleware.Context, params martini.Params) {
 	var readmeFile *models.RepoFile
 
 	for _, f := range files {
-		if !f.IsFile() {
+		if !f.IsFile() || len(f.Name) < 6 {
 			continue
-		}
-
-		if len(f.Name) < 6 {
-			continue
-		}
-
-		if strings.ToLower(f.Name[:6]) == "readme" {
+		} else if strings.ToLower(f.Name[:6]) == "readme" {
 			readmeFile = f
 			break
 		}
 	}
 
 	if readmeFile != nil {
+		ctx.Data["ReadmeExist"] = true
 		// if file large than 1M not show it
 		if readmeFile.Size > 1024*1024 || readmeFile.Filemode != git.FileModeBlob {
 			ctx.Data["FileIsLarge"] = true
@@ -136,8 +131,9 @@ func Setting(ctx *middleware.Context, params martini.Params) {
 	ctx.Render.HTML(200, "repo/setting", ctx.Data)
 }
 
-func Commits(ctx *middleware.Context) string {
-	return "This is commits page"
+func Commits(ctx *middleware.Context) {
+	ctx.Data["IsRepoToolbarCommits"] = true
+	ctx.Render.HTML(200, "repo/commits", ctx.Data)
 }
 
 func Issues(ctx *middleware.Context) string {
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
new file mode 100644
index 00000000..7ebe68b6
--- /dev/null
+++ b/templates/repo/commits.tmpl
@@ -0,0 +1,9 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+{{template "repo/nav" .}}
+{{template "repo/toolbar" .}}
+<div id="gogs-body" class="container">
+    <div id="gogs-commits">
+    </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl
index c22f129f..561deb25 100644
--- a/templates/repo/single.tmpl
+++ b/templates/repo/single.tmpl
@@ -83,6 +83,7 @@
                 </tbody>
             </table>
         </div>
+        {{if .ReadmeExist}}
         <div class="panel panel-default file-content">
             <div class="panel-heading file-head">
                 <i class="icon fa fa-book"></i> README.md
@@ -97,6 +98,7 @@
                 </div>
             {{end}}
         </div>
+        {{end}}
     </div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file