aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-18 12:12:10 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-18 12:12:10 -0400
commit8719c1b8c50cc68d734053d26d7b819e92783025 (patch)
tree03add91545f0dfefefd1fac773215dac81f84577
parent642687d08df55aa3465bbb58b2120ecd53b333c7 (diff)
downloadgitea-8719c1b8c50cc68d734053d26d7b819e92783025.tar.gz
gitea-8719c1b8c50cc68d734053d26d7b819e92783025.zip
Mirror bug fix
-rw-r--r--routers/user/user.go4
-rw-r--r--templates/user/activate.tmpl (renamed from templates/user/active.tmpl)0
-rw-r--r--web.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/routers/user/user.go b/routers/user/user.go
index 56b9dc205c..ce4d0cc3d0 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -341,7 +341,7 @@ func Activate(ctx *middleware.Context) {
} else {
ctx.Data["ServiceNotEnabled"] = true
}
- ctx.HTML(200, "user/active")
+ ctx.HTML(200, "user/activate")
return
}
@@ -363,7 +363,7 @@ func Activate(ctx *middleware.Context) {
}
ctx.Data["IsActivateFailed"] = true
- ctx.HTML(200, "user/active")
+ ctx.HTML(200, "user/activate")
}
func ForgotPasswd(ctx *middleware.Context) {
diff --git a/templates/user/active.tmpl b/templates/user/activate.tmpl
index 9cac069dce..9cac069dce 100644
--- a/templates/user/active.tmpl
+++ b/templates/user/activate.tmpl
diff --git a/web.go b/web.go
index 0be2a05a04..58d0bc04cb 100644
--- a/web.go
+++ b/web.go
@@ -100,7 +100,7 @@ func runWeb(*cli.Context) {
}, reqSignIn)
m.Group("/user", func(r martini.Router) {
r.Get("/feeds", middleware.Bind(auth.FeedsForm{}), user.Feeds)
- r.Get("/activate", user.Activate)
+ r.Any("/activate", user.Activate)
r.Get("/email2user", user.Email2User)
r.Get("/forget_password", user.ForgotPasswd)
r.Post("/forget_password", user.ForgotPasswdPost)