aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-20 03:24:17 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-20 03:24:17 -0400
commit5cb2d3d2e233def07d6956af47dfc49acc45c7e6 (patch)
tree83db94541a785e7a22dbf6ac61d93194ce890710
parentf9fd972cbef25c379ab465ac8a568ef99d44f8da (diff)
downloadgitea-5cb2d3d2e233def07d6956af47dfc49acc45c7e6.tar.gz
gitea-5cb2d3d2e233def07d6956af47dfc49acc45c7e6.zip
Bug fix
-rw-r--r--README.md1
-rw-r--r--routers/user/user.go4
2 files changed, 5 insertions, 0 deletions
diff --git a/README.md b/README.md
index b43e3c98a5..3a1023c6d9 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ There are some very good products in this category such as [gitlab](http://gitla
- Please see [Wiki](https://github.com/gogits/gogs/wiki) for project design, develop specification, change log and road map.
- See [Trello Broad](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team.
- Try it before anything? Go down to **Installation -> Install from binary** section!.
+- Having troubles? Get help from [Troubleshooting](https://github.com/gogits/gogs/wiki/Troubleshooting).
## Features
diff --git a/routers/user/user.go b/routers/user/user.go
index 37070af3f9..f495cb13ab 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -233,6 +233,10 @@ func Activate(ctx *middleware.Context) {
code := ctx.Query("code")
if len(code) == 0 {
ctx.Data["IsActivatePage"] = true
+ if ctx.User.IsActive {
+ ctx.Error(404)
+ return
+ }
// Resend confirmation e-mail.
if base.Service.RegisterEmailConfirm {
ctx.Data["Hours"] = base.Service.ActiveCodeLives / 60