diff options
| author | Emrah URHAN <raxetul@gmail.com> | 2015-11-22 19:40:18 +0200 |
|---|---|---|
| committer | Emrah URHAN <raxetul@gmail.com> | 2015-11-22 19:40:18 +0200 |
| commit | 737da1a3748d7c82af771d3ba4aa4c76ba219eee (patch) | |
| tree | b59104944ba28771752adcc1231a847b6704ac4d /routers/user/auth.go | |
| parent | f63a468dfce812423b78a47cfa2583c5ad2faa49 (diff) | |
| parent | efaf60ba5a4a7c0954dbaf57203859db3258281f (diff) | |
Latest develop updates is merged with my RaspberryPi Dockerfile version.
Merge branch 'develop' of https://github.com/gogits/gogs into develop
Diffstat (limited to 'routers/user/auth.go')
| -rw-r--r-- | routers/user/auth.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 54cbf447..24ed3673 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -40,8 +40,9 @@ func SignIn(ctx *middleware.Context) { if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl) ctx.Redirect(redirectTo) + } else { + ctx.Redirect(setting.AppSubUrl + "/") } - ctx.Redirect(setting.AppSubUrl + "/") return } @@ -253,7 +254,7 @@ func ActivateEmail(ctx *middleware.Context) { } log.Trace("Email activated: %s", email.Email) - ctx.Flash.Success(ctx.Tr("settings.add_email_successs")) + ctx.Flash.Success(ctx.Tr("settings.add_email_success")) } ctx.Redirect(setting.AppSubUrl + "/user/settings/email") |