diff options
| author | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
|---|---|---|
| committer | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-17 12:04:18 +0800 |
| commit | 061a879cea39a1cce56dcb394b912fad50d7b77a (patch) | |
| tree | 26e8c3d25da1b9d785421a6a02b7564798b2e8c4 /routers | |
| parent | ed84adb679f3de70b2bffaead20a87711c38ee3a (diff) | |
| parent | 9f015b4c73806e65d3ca085b76723dc8cf41eb02 (diff) | |
| download | gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.tar.gz gitea-061a879cea39a1cce56dcb394b912fad50d7b77a.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
conf/app.ini
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/user/auth.go | 2 | ||||
| -rw-r--r-- | routers/user/home.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 231ee66279..e3d132166e 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -280,7 +280,7 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe ctx.Data["IsSendRegisterMail"] = true ctx.Data["Email"] = u.Email ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 - ctx.HTML(200, "user/activate") + ctx.HTML(200, ACTIVATE) if err := ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { log.Error(4, "Set cache(MailResendLimit) fail: %v", err) diff --git a/routers/user/home.go b/routers/user/home.go index bd33318d3c..372f111aec 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -94,7 +94,7 @@ func Dashboard(ctx *middleware.Context) { feeds := make([]*models.Action, 0, len(actions)) for _, act := range actions { if act.IsPrivate { - if has, _ := models.HasAccess(ctxUser.Name, act.RepoUserName+"/"+act.RepoName, + if has, _ := models.HasAccess(ctx.User.Name, act.RepoUserName+"/"+act.RepoName, models.READABLE); !has { continue } |