Bug fix

diff --git a/README.md b/README.md
index b43e3c98a521da5eab235700bd26922e8093cc5f..3a1023c6d92155b018ede2b198fa80fad3f5265e 100644 (file)
--- 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 37070af3f91c2e996b6d27f723eacd2ea37a85ef..f495cb13ab6dfe16e72dd53245949264e6b3381a 100644 (file)
--- 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