Merge branch 'dev' of github.com:gogits/gogs into dev

2 files changed, 9 insertions, 1 deletions

diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index f353ea51..619a13b1 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -82,7 +82,8 @@ func (ctx *Context) HasError() bool {
 	if !ok {
 		return false
 	}
-	ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
+	ctx.Flash.ErrorMsg = ctx.Data["ErrorMsg"].(string)
+	ctx.Data["Flash"] = ctx.Flash
 	return hasErr.(bool)
 }
 
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 1e79ce98..82c1c2db 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -123,6 +123,13 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
 		ctx.Repo.GitRepo = gitRepo
 		ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name
 
+		tags, err := ctx.Repo.GitRepo.GetTags()
+		if err != nil {
+			ctx.Handle(500, "RepoAssignment(GetTags))", err)
+			return
+		}
+		ctx.Repo.Repository.NumTags = len(tags)
+
 		ctx.Data["Title"] = user.Name + "/" + repo.Name
 		ctx.Data["Repository"] = repo
 		ctx.Data["Owner"] = user