From 3a32cbee440bbba034ff68d399b3620fa8679253 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Tue, 25 Aug 2015 02:47:43 +0800
Subject: [PATCH] #1246 Dashboard error: nil commits

---
 gogs.go                             | 2 +-
 templates/.VERSION                  | 2 +-
 templates/user/dashboard/feeds.tmpl | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gogs.go b/gogs.go
index 777aad68cf..ee85734c18 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.5.0824 Beta"
+const APP_VER = "0.6.5.0825 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/templates/.VERSION b/templates/.VERSION
index 5b133cfbe6..90fe3b1585 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.5.0824 Beta
\ No newline at end of file
+0.6.5.0825 Beta
\ No newline at end of file
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index d2e66b308b..3ef3da3c12 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -27,9 +27,11 @@
             <ul class="list-no-style">
                 {{ $push := ActionContent2Commits .}}
                 {{ $repoLink := .GetRepoLink}}
+                {{if $push.Commits}}
                 {{range $push.Commits}}
                 <li><img class="avatar-16" src="{{AvatarLink .AuthorEmail}}?s=16"> <a href="{{$repoLink}}/commit/{{.Sha1}}">{{ShortSha .Sha1}}</a> <span class="text-truncate grid-4-5">{{.Message}}</span></li>
                 {{end}}
+                {{end}}
                 {{if $push.CompareUrl}}<li><a href="{{AppSubUrl}}/{{$push.CompareUrl}}">{{$.i18n.Tr "action.compare_2_commits"}} »</a></li>{{end}}
             </ul>
         </div>